[App Management] Set the favicon of App Management to be a gear.

The favicon for the App Management page was changed from the default favicon
to the favicon of the settings page.

Bug: 947895, 906508
Change-Id: Ibfec0f725024430ab883b52aa2231d810a326c2d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1546741
Commit-Queue: Jeevan Shikaram <jshikaram@chromium.org>
Auto-Submit: Jeevan Shikaram <jshikaram@chromium.org>
Reviewed-by: Dominick Ng <dominickn@chromium.org>
Reviewed-by: Scott Chen <scottchen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#646653}

chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

@@ -897,6 +897,10 @@ base::RefCountedMemory* ChromeWebUIControllerFactory::GetFaviconResourceBytes(
   if (page_url.host_piece() == chrome::kChromeUIManagementHost)
     return ManagementUI::GetFaviconResourceBytes(scale_factor);
 
+  // Android doesn't use the App Management page.
+  if (page_url.host_piece() == chrome::kChromeUIAppManagementHost)
+    return settings_utils::GetFaviconResourceBytes(scale_factor);
+
 #if BUILDFLAG(ENABLE_EXTENSIONS)
   if (page_url.host_piece() == chrome::kChromeUIExtensionsHost) {
     return extensions::ExtensionsUI::GetFaviconResourceBytes(scale_factor);

chrome/common/webui_url_constants.cc

@@ -22,6 +22,7 @@ const char kChromeUIAccessibilityHost[] = "accessibility";
 const char kChromeUIAppIconHost[] = "app-icon";
 const char kChromeUIAppIconURL[] = "chrome://app-icon/";
 const char kChromeUIAppLauncherPageHost[] = "apps";
+const char kChromeUIAppManagementHost[] = "apps";
 const char kChromeUIAppsURL[] = "chrome://apps/";
 const char kChromeUIAutofillInternalsHost[] = "autofill-internals";
 const char kChromeUIBluetoothInternalsHost[] = "bluetooth-internals";

chrome/common/webui_url_constants.h

@@ -29,6 +29,7 @@ extern const char kChromeUIAccessibilityHost[];
 extern const char kChromeUIAppIconHost[];
 extern const char kChromeUIAppIconURL[];
 extern const char kChromeUIAppLauncherPageHost[];
+extern const char kChromeUIAppManagementHost[];
 extern const char kChromeUIAppsURL[];
 extern const char kChromeUIAutofillInternalsHost[];
 extern const char kChromeUIBluetoothInternalsHost[];