Revert of MD Settings: enable by default in client

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>
@@ skipping 64 matching lines @@
            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);
-
   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),
@@ skipping 30 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());
 }