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

chrome/browser/browser_about_handler_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/browser_about_handler.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <utility>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/test/scoped_feature_list.h"
 #include "chrome/common/chrome_features.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/testing_profile.h"
 #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"
 #include "url/gurl.h"
 
 using content::BrowserThread;
 using content::NavigationController;
 using content::NavigationEntry;
 using content::Referrer;
 
@@ skipping 49 matching lines @@
 #if defined(OS_CHROMEOS)
 // Chrome OS defaults to showing Options in a window and including About in
 // Options.
 TEST_F(BrowserAboutHandlerTest, WillHandleBrowserAboutURLForOptionsChromeOS) {
   base::test::ScopedFeatureList scoped_feature_list;
   scoped_feature_list.InitAndDisableFeature(features::kMaterialDesignSettings);
 
   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);
 }
 
 #else
 TEST_F(BrowserAboutHandlerTest, WillHandleBrowserAboutURLForOptions) {
   base::test::ScopedFeatureList scoped_feature_list;
   scoped_feature_list.InitAndDisableFeature(features::kMaterialDesignSettings);
 
   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::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);
 }
 #endif
 
 TEST_F(BrowserAboutHandlerTest, WillHandleBrowserAboutURLForMDSettings) {
   base::test::ScopedFeatureList scoped_feature_list;
   scoped_feature_list.InitAndEnableFeature(features::kMaterialDesignSettings);
 
   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);
 }
 
 // Ensure that minor BrowserAboutHandler fixup to a URL does not cause us to
 // keep a separate virtual URL, which would not be updated on redirects.
 // See https://crbug.com/449829.
 TEST_F(BrowserAboutHandlerTest, NoVirtualURLForFixup) {
   GURL url("view-source:http://.foo");
 
   // Fixup will remove the dot and add a slash.
   GURL fixed_url("view-source:http://foo/");
 
   // Rewriters will remove the view-source prefix and expect it to stay in the
   // virtual URL.
   GURL rewritten_url("http://foo/");
 
   TestingProfile profile;
   std::unique_ptr<NavigationEntry> entry(
       NavigationController::CreateNavigationEntry(
           url, Referrer(), ui::PAGE_TRANSITION_RELOAD, false, std::string(),
           &profile));
   EXPECT_EQ(fixed_url, entry->GetVirtualURL());
   EXPECT_EQ(rewritten_url, entry->GetURL());
 }