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

chrome/browser/chrome_content_browser_client.cc

Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index cc303c1d20d8000af36dbe77d71f0fa289ca70f1..fee60179e0ab401e040de67c32510fbff4246dc1 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -622,11 +622,11 @@ bool HandleNewTabPageLocationOverride(
 bool HandleWebUI(GURL* url, content::BrowserContext* browser_context) {
   if (base::FeatureList::IsEnabled(features::kMaterialDesignSettings)) {
     // Rewrite chrome://help and chrome://chrome to chrome://settings/help.
-    if (url->host() == chrome::kChromeUIHelpHost ||
+    if (url->host() == content::kChromeUIHelpHost ||
         (url->host() == chrome::kChromeUIUberHost &&
          (url->path().empty() || url->path() == "/"))) {
-      *url = ReplaceURLHostAndPath(*url, chrome::kChromeUISettingsHost,
-                                   chrome::kChromeUIHelpHost);
+      *url = ReplaceURLHostAndPath(*url, content::kChromeUISettingsHost,
+                                   content::kChromeUIHelpHost);
       return true;  // Return true to update the displayed URL.
     }
   }
@@ -669,7 +669,7 @@ bool HandleWebUIReverse(GURL* url, content::BrowserContext* browser_context) {
   // No need to actually reverse-rewrite the URL, but return true to update the
   // displayed URL when rewriting chrome://help to chrome://settings/help.
   if (base::FeatureList::IsEnabled(features::kMaterialDesignSettings) &&
-      url->host() == chrome::kChromeUISettingsHost) {
+      url->host() == content::kChromeUISettingsHost) {
     return true;
   }