Start removing deprecated Options UI code

chrome/browser/chrome_content_browser_client_browsertest.cc

Index: chrome/browser/chrome_content_browser_client_browsertest.cc
diff --git a/chrome/browser/chrome_content_browser_client_browsertest.cc b/chrome/browser/chrome_content_browser_client_browsertest.cc
index e0e82fe9c19754ffaeb78f27bb4aea892b343468..dd9116ed1f167b211ada1897bde260370e77675d 100644
--- a/chrome/browser/chrome_content_browser_client_browsertest.cc
+++ b/chrome/browser/chrome_content_browser_client_browsertest.cc
@@ -4,12 +4,10 @@
 
 #include "base/command_line.h"
 #include "base/macros.h"
-#include "base/test/scoped_feature_list.h"
 #include "build/build_config.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
-#include "chrome/common/chrome_features.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
@@ -33,49 +31,9 @@ class ChromeContentBrowserClientBrowserTest : public InProcessBrowserTest {
     return browser()->tab_strip_model()->GetWebContentsAt(0)->
         GetController().GetLastCommittedEntry();
   }
-
-  void SetUpInProcessBrowserTestFixture() override {
-    disable_md_settings_.InitAndDisableFeature(
-        features::kMaterialDesignSettings);
-  }
-
-#if defined(OS_CHROMEOS)
-  void SetUpCommandLine(base::CommandLine* command_line) override {
-    command_line->AppendSwitch(switches::kDisableSettingsWindow);
-  }
-#endif
-
- private:
-  base::test::ScopedFeatureList disable_md_settings_;
 };
 
 IN_PROC_BROWSER_TEST_F(ChromeContentBrowserClientBrowserTest,
-                       UberURLHandler_SettingsPage) {
-  const GURL url_short("chrome://settings/");
-  const GURL url_long("chrome://chrome/settings/");
-
-  ui_test_utils::NavigateToURL(browser(), url_short);
-  NavigationEntry* entry = GetLastCommittedEntry();
-
-  ASSERT_TRUE(entry != NULL);
-  EXPECT_EQ(url_long, entry->GetURL());
-  EXPECT_EQ(url_short, entry->GetVirtualURL());
-}
-
-IN_PROC_BROWSER_TEST_F(ChromeContentBrowserClientBrowserTest,
-                       UberURLHandler_ContentSettingsPage) {
-  const GURL url_short("chrome://settings/content");
-  const GURL url_long("chrome://chrome/settings/content");
-
-  ui_test_utils::NavigateToURL(browser(), url_short);
-  NavigationEntry* entry = GetLastCommittedEntry();
-
-  ASSERT_TRUE(entry != NULL);
-  EXPECT_EQ(url_long, entry->GetURL());
-  EXPECT_EQ(url_short, entry->GetVirtualURL());
-}
-
-IN_PROC_BROWSER_TEST_F(ChromeContentBrowserClientBrowserTest,
                        UberURLHandler_AboutPage) {
   const GURL url("chrome://chrome/");