MD Settings: enhance restarting Chrome + interacting w/ session restore

chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
index 45433fe5ef4c507a65b53d895ef985becac56b8c..f272e320eb15670c333fa2df3059fe8ed3430067 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -443,13 +443,13 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
   }
   // Material Design Settings gets its own host, if enabled.
   if (base::FeatureList::IsEnabled(features::kMaterialDesignSettings) &&
-      url.host_piece() == chrome::kChromeUISettingsHost) {
+      url.host_piece() == content::kChromeUISettingsHost) {
     return &NewWebUI<settings::MdSettingsUI>;
   }
   // Settings are implemented with native UI elements on Android.
   // Handle chrome://settings if settings in a window is enabled.
   if (url.host_piece() == chrome::kChromeUISettingsFrameHost ||
-      (url.host_piece() == chrome::kChromeUISettingsHost &&
+      (url.host_piece() == content::kChromeUISettingsHost &&
        ::switches::SettingsWindowEnabled())) {
     return &NewWebUI<options::OptionsUI>;
   }
@@ -816,7 +816,7 @@ base::RefCountedMemory* ChromeWebUIControllerFactory::GetFaviconResourceBytes(
     return MdDownloadsUI::GetFaviconResourceBytes(scale_factor);
 
   // Android doesn't use the Options/Settings pages.
-  if (page_url.host_piece() == chrome::kChromeUISettingsHost ||
+  if (page_url.host_piece() == content::kChromeUISettingsHost ||
       page_url.host_piece() == chrome::kChromeUISettingsFrameHost ||
       page_url.host_piece() == chrome::kChromeUIMdSettingsHost)
     return settings_utils::GetFaviconResourceBytes(scale_factor);