Start removing deprecated Options UI code

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/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"
 
@@ skipping 44 matching lines @@
         GURL(chrome_prefix + chrome::kChromeUISyncInternalsHost)},
        {GURL(chrome_prefix + chrome::kChromeUIInvalidationsHost),
         GURL(chrome_prefix + chrome::kChromeUIInvalidationsHost)},
        {
            GURL(chrome_prefix + "host/path?query#ref"),
            GURL(chrome_prefix + "host/path?query#ref"),
        }});
   TestWillHandleBrowserAboutURL(test_cases);
 }
 
-#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);
-
+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::kChromeUISettingsFrameHost)},
-       {GURL(chrome_prefix + chrome::kChromeUIHelpHost),
-        GURL(chrome_prefix + chrome::kChromeUISettingsFrameHost + "/" +
-             chrome::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 + chrome::kChromeUIUberHost + "/" +
-                chrome::kChromeUISettingsHost + "/"),
-       },
-       {
-           GURL(chrome_prefix + chrome::kChromeUIHelpHost),
-           GURL(chrome_prefix + chrome::kChromeUIUberHost + "/" +
-                chrome::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)}});
   TestWillHandleBrowserAboutURL(test_cases);
 }
 
 TEST_F(BrowserAboutHandlerTest, WillHandleBrowserAboutURLForHistory) {
   TestWillHandleBrowserAboutURL(std::vector<AboutURLTestCase>({
       {GURL("about:history"), GURL("chrome://history/")},
       {GURL("about:history-frame"), GURL("chrome://history/")},
       {GURL("chrome://history"), GURL("chrome://history/")},
@@ skipping 19 matching lines @@
   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());
 }