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

chrome/browser/browser_about_handler_unittest.cc

Index: chrome/browser/browser_about_handler_unittest.cc
diff --git a/chrome/browser/browser_about_handler_unittest.cc b/chrome/browser/browser_about_handler_unittest.cc
index 321fd720b95d79b4e56ad7df47fbf9b951d9c2fe..3203c0aa8d214ab1f5186582adf92f0eedffa855 100644
--- a/chrome/browser/browser_about_handler_unittest.cc
+++ b/chrome/browser/browser_about_handler_unittest.cc
@@ -19,6 +19,7 @@
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/common/referrer.h"
+#include "content/public/common/url_constants.h"
 #include "content/public/test/test_browser_thread.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -88,11 +89,11 @@ TEST_F(BrowserAboutHandlerTest, WillHandleBrowserAboutURLForOptionsChromeOS) {
   std::string chrome_prefix(content::kChromeUIScheme);
   chrome_prefix.append(url::kStandardSchemeSeparator);
   std::vector<AboutURLTestCase> test_cases(
-      {{GURL(chrome_prefix + chrome::kChromeUISettingsHost),
+      {{GURL(chrome_prefix + content::kChromeUISettingsHost),
         GURL(chrome_prefix + chrome::kChromeUISettingsFrameHost)},
-       {GURL(chrome_prefix + chrome::kChromeUIHelpHost),
+       {GURL(chrome_prefix + content::kChromeUIHelpHost),
         GURL(chrome_prefix + chrome::kChromeUISettingsFrameHost + "/" +
-             chrome::kChromeUIHelpHost)}});
+             content::kChromeUIHelpHost)}});
   TestWillHandleBrowserAboutURL(test_cases);
 }
 
@@ -105,14 +106,14 @@ TEST_F(BrowserAboutHandlerTest, WillHandleBrowserAboutURLForOptions) {
   chrome_prefix.append(url::kStandardSchemeSeparator);
   std::vector<AboutURLTestCase> test_cases(
       {{
-           GURL(chrome_prefix + chrome::kChromeUISettingsHost),
+           GURL(chrome_prefix + content::kChromeUISettingsHost),
            GURL(chrome_prefix + chrome::kChromeUIUberHost + "/" +
-                chrome::kChromeUISettingsHost + "/"),
+                content::kChromeUISettingsHost + "/"),
        },
        {
-           GURL(chrome_prefix + chrome::kChromeUIHelpHost),
+           GURL(chrome_prefix + content::kChromeUIHelpHost),
            GURL(chrome_prefix + chrome::kChromeUIUberHost + "/" +
-                chrome::kChromeUIHelpHost + "/"),
+                content::kChromeUIHelpHost + "/"),
        }});
   TestWillHandleBrowserAboutURL(test_cases);
 }
@@ -125,8 +126,8 @@ TEST_F(BrowserAboutHandlerTest, WillHandleBrowserAboutURLForMDSettings) {
   std::string chrome_prefix(content::kChromeUIScheme);
   chrome_prefix.append(url::kStandardSchemeSeparator);
   std::vector<AboutURLTestCase> test_cases(
-      {{GURL(chrome_prefix + chrome::kChromeUISettingsHost),
-        GURL(chrome_prefix + chrome::kChromeUISettingsHost)}});
+      {{GURL(chrome_prefix + content::kChromeUISettingsHost),
+        GURL(chrome_prefix + content::kChromeUISettingsHost)}});
   TestWillHandleBrowserAboutURL(test_cases);
 }