Consolidate chrome/browser/android/banners into chrome/brower/banners.

This CL removes the chrome/browser/android/banners directory and moves
all files to chrome/browser/banners. This means that there is one fewer
directory for C++ app banner code to live in.

The obsolete AppBannerMetricsIds.template is also removed in this CL.

BUG=None
[email protected]

Change-Id: I376b42a51d7cc94d829c9acaac1707268a7976ec
Reviewed-on: https://chromium-review.googlesource.com/756370
Reviewed-by: Ted Choc <[email protected]>
Reviewed-by: Ben Wells <[email protected]>
Reviewed-by: Peter Kotwicz <[email protected]>
Commit-Queue: Dominick Ng <[email protected]>
Cr-Commit-Position: refs/heads/master@{#514729}
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 8fe4e5f..902db05 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -1791,10 +1791,6 @@
       "android/background_sync_launcher_android.h",
       "android/background_tab_manager.cc",
       "android/background_tab_manager.h",
-      "android/banners/app_banner_infobar_delegate_android.cc",
-      "android/banners/app_banner_infobar_delegate_android.h",
-      "android/banners/app_banner_manager_android.cc",
-      "android/banners/app_banner_manager_android.h",
       "android/bookmarks/bookmark_bridge.cc",
       "android/bookmarks/bookmark_bridge.h",
       "android/bookmarks/partner_bookmarks_reader.cc",
@@ -2133,6 +2129,10 @@
       "autofill/android/personal_data_manager_android.cc",
       "autofill/android/personal_data_manager_android.h",
       "autofill/android/phone_number_util_android.cc",
+      "banners/app_banner_infobar_delegate_android.cc",
+      "banners/app_banner_infobar_delegate_android.h",
+      "banners/app_banner_manager_android.cc",
+      "banners/app_banner_manager_android.h",
       "chrome_browser_field_trials_mobile.cc",
       "chrome_browser_field_trials_mobile.h",
       "dom_distiller/dom_distiller_service_factory_android.cc",