Eliminate chrome::IsTrustedWindowWithScheme

chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc

Index: chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc
diff --git a/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc b/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc
index 24e5147e10c6a2c3d4149fd8959b61c93dc40a0f..000b103566725d7270b89f4c5b4c76fb01648d61 100644
--- a/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc
+++ b/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc
@@ -22,7 +22,6 @@
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
-#include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/settings_window_manager.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/web_applications/web_app.h"
@@ -109,7 +108,7 @@ void BrowserShortcutLauncherItemController::SetShelfIDForBrowserWindowContents(
   if (!browser ||
       !launcher_controller()->IsBrowserFromActiveUser(browser) ||
       browser->host_desktop_type() != chrome::HOST_DESKTOP_TYPE_ASH ||
-      chrome::IsTrustedPopupWindowWithScheme(browser, content::kChromeUIScheme))
+      chrome::SettingsWindowManager::GetInstance()->IsSettingsBrowser(browser))
     return;
 
   ash::SetShelfIDForWindow(
@@ -349,8 +348,8 @@ bool BrowserShortcutLauncherItemController::IsBrowserRepresentedInBrowserList(
           web_app::GetExtensionIdFromApplicationName(browser->app_name())) > 0)
     return false;
 
-  // Stand-alone chrome:// windows (e.g. settings) have their own icon.
-  if (chrome::IsTrustedPopupWindowWithScheme(browser, content::kChromeUIScheme))
+  // Settings windows have their own icon.
+  if (chrome::SettingsWindowManager::GetInstance()->IsSettingsBrowser(browser))
     return false;
 
   // Tabbed browser and other popup windows are all represented.