| 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 fa57c299a93482c6664942a016f58ce2ec07b57c..e0e82fe9c19754ffaeb78f27bb4aea892b343468 100644
|
| --- a/chrome/browser/chrome_content_browser_client_browsertest.cc
|
| +++ b/chrome/browser/chrome_content_browser_client_browsertest.cc
|
| @@ -4,10 +4,12 @@
|
|
|
| #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"
|
| @@ -32,11 +34,19 @@ class ChromeContentBrowserClientBrowserTest : public InProcessBrowserTest {
|
| 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,
|
|
|