Eliminate chrome::IsTrustedWindowWithScheme

chrome/browser/ui/settings_window_manager.h

Index: chrome/browser/ui/settings_window_manager.h
diff --git a/chrome/browser/ui/settings_window_manager.h b/chrome/browser/ui/settings_window_manager.h
index 5c5ec7b0f32f0d8bdf2399c4bdc3adaa463fed94..c82f2e3dca2250bf7b64f56011b08ccc33b29588 100644
--- a/chrome/browser/ui/settings_window_manager.h
+++ b/chrome/browser/ui/settings_window_manager.h
@@ -8,6 +8,7 @@
 #include <map>
 #include <string>
 
+#include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/observer_list.h"
 #include "components/sessions/session_id.h"
@@ -19,6 +20,7 @@ class Profile;
 namespace chrome {
 
 class SettingsWindowManagerObserver;
+struct NavigateParams;
 
 // Class for managing settings windows when --enable-settings-window is enabled.
 // TODO(stevenjb): Remove flag comment if enabled by default.
@@ -50,6 +52,9 @@ class SettingsWindowManager {
 
   ObserverList<SettingsWindowManagerObserver> observers_;
   ProfileSessionMap settings_session_map_;
+  // Persist the most recent Browser NavigateParams so that we can identify
+  // settings browsers during chrome::Navigate() calls.
+  scoped_ptr<NavigateParams> navigate_params_;
 
   DISALLOW_COPY_AND_ASSIGN(SettingsWindowManager);
 };