Revert of MD Settings: enable by default in client

chrome/browser/ui/webui/options/options_ui_browsertest.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/ui/webui/options/options_ui_browsertest.h"
 
 #include "base/scoped_observer.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/signin/account_tracker_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/webui/options/options_ui.h"
 #include "chrome/browser/ui/webui/uber/uber_ui.h"
-#include "chrome/common/chrome_features.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/prefs/pref_service.h"
 #include "components/signin/core/browser/account_tracker_service.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "components/strings/grit/components_strings.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 71 matching lines @@
 bool FrameHasSettingsSourceHost(content::RenderFrameHost* frame) {
   return frame->GetLastCommittedURL().DomainIs(
       chrome::kChromeUISettingsFrameHost);
 }
 
 }  // namespace
 
 OptionsUIBrowserTest::OptionsUIBrowserTest() {
 }
 
-void OptionsUIBrowserTest::SetUpInProcessBrowserTestFixture() {
-  InProcessBrowserTest::SetUpInProcessBrowserTestFixture();
-  disable_md_settings_.InitAndDisableFeature(features::kMaterialDesignSettings);
-}
-
 void OptionsUIBrowserTest::NavigateToSettings() {
   NavigateToSettingsSubpage("");
 }
 
 void OptionsUIBrowserTest::NavigateToSettingsSubpage(
     const std::string& sub_page) {
   const GURL& url = chrome::GetSettingsUrl(sub_page);
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), url, WindowOpenDisposition::CURRENT_TAB, 0);
 
@@ skipping 209 matching lines @@
   run_loop.Run();
 
   // Verify that the settings page has updated and lists two profiles.
   ASSERT_TRUE(content::ExecuteScriptAndExtractInt(
       contents, javascript, &profiles));
   EXPECT_EQ(2, profiles);
 }
 #endif
 
 }  // namespace options