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

chrome/browser/browser_about_handler.cc

Index: chrome/browser/browser_about_handler.cc
diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc
index 96c0189a0006c579826dc135d95f151de0c89700..8034f4c0c0a92e29ad960930c2cecc9eaafdc86d 100644
--- a/chrome/browser/browser_about_handler.cc
+++ b/chrome/browser/browser_about_handler.cc
@@ -80,7 +80,7 @@ bool WillHandleBrowserAboutURL(GURL* url,
       path = chrome::kChromeUIExtensionsHost + url->path();
     }
   // Redirect chrome://settings/extensions (legacy URL).
-  } else if (host == chrome::kChromeUISettingsHost &&
+  } else if (host == content::kChromeUISettingsHost &&
              url->path() ==
                  std::string("/") + chrome::kDeprecatedExtensionsSubPage) {
     host = chrome::kChromeUIUberHost;
@@ -108,26 +108,26 @@ bool WillHandleBrowserAboutURL(GURL* url,
     }
 #endif
   // Redirect chrome://settings, unless MD settings is enabled.
-  } else if (host == chrome::kChromeUISettingsHost) {
+  } else if (host == content::kChromeUISettingsHost) {
     if (base::FeatureList::IsEnabled(features::kMaterialDesignSettings)) {
       return true;  // Prevent further rewriting - this is a valid URL.
     } else if (::switches::SettingsWindowEnabled()) {
       host = chrome::kChromeUISettingsFrameHost;
     } else {
       host = chrome::kChromeUIUberHost;
-      path = chrome::kChromeUISettingsHost + url->path();
+      path = content::kChromeUISettingsHost + url->path();
     }
   // Redirect chrome://help, unless MD settings is enabled.
-  } else if (host == chrome::kChromeUIHelpHost) {
+  } else if (host == content::kChromeUIHelpHost) {
     if (base::FeatureList::IsEnabled(features::kMaterialDesignSettings)) {
       return false;  // Handled in the HandleWebUI handler.
     } else if (::switches::SettingsWindowEnabled()) {
       host = chrome::kChromeUISettingsFrameHost;
       if (url->path().empty() || url->path() == "/")
-        path = chrome::kChromeUIHelpHost;
+        path = content::kChromeUIHelpHost;
     } else {
       host = chrome::kChromeUIUberHost;
-      path = chrome::kChromeUIHelpHost + url->path();
+      path = content::kChromeUIHelpHost + url->path();
     }
   }