OLD | NEW |
1 // Copyright (c) 2015 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include <string> | 5 #include <string> |
6 #include <utility> | 6 #include <utility> |
7 | 7 |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/macros.h" | 9 #include "base/macros.h" |
10 #include "chrome/browser/extensions/extension_service.h" | 10 #include "chrome/browser/extensions/extension_service.h" |
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
87 | 87 |
88 IN_PROC_BROWSER_TEST_F(UberUIBrowserTest, EnableMdExtensionsHidesExtensions) { | 88 IN_PROC_BROWSER_TEST_F(UberUIBrowserTest, EnableMdExtensionsHidesExtensions) { |
89 base::CommandLine::ForCurrentProcess()->AppendSwitch( | 89 base::CommandLine::ForCurrentProcess()->AppendSwitch( |
90 ::switches::kEnableMaterialDesignExtensions); | 90 ::switches::kEnableMaterialDesignExtensions); |
91 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIUberFrameURL)); | 91 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIUberFrameURL)); |
92 SelectTab(); | 92 SelectTab(); |
93 EXPECT_TRUE(GetJsBool("$('extensions').hidden")); | 93 EXPECT_TRUE(GetJsBool("$('extensions').hidden")); |
94 } | 94 } |
95 | 95 |
96 IN_PROC_BROWSER_TEST_F(UberUIBrowserTest, EnableMdHistoryHidesHistory) { | 96 IN_PROC_BROWSER_TEST_F(UberUIBrowserTest, EnableMdHistoryHidesHistory) { |
97 scoped_ptr<base::FeatureList> feature_list(new base::FeatureList); | 97 std::unique_ptr<base::FeatureList> feature_list(new base::FeatureList); |
98 feature_list->InitializeFromCommandLine( | 98 feature_list->InitializeFromCommandLine( |
99 features::kMaterialDesignHistoryFeature.name, ""); | 99 features::kMaterialDesignHistoryFeature.name, ""); |
100 base::FeatureList::ClearInstanceForTesting(); | 100 base::FeatureList::ClearInstanceForTesting(); |
101 base::FeatureList::SetInstance(std::move(feature_list)); | 101 base::FeatureList::SetInstance(std::move(feature_list)); |
102 | 102 |
103 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIUberFrameURL)); | 103 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIUberFrameURL)); |
104 SelectTab(); | 104 SelectTab(); |
105 EXPECT_TRUE(GetJsBool("$('history').hidden")); | 105 EXPECT_TRUE(GetJsBool("$('history').hidden")); |
106 } | 106 } |
107 | 107 |
108 IN_PROC_BROWSER_TEST_F(UberUIBrowserTest, | 108 IN_PROC_BROWSER_TEST_F(UberUIBrowserTest, |
109 EnableSettingsWindowHidesSettingsAndHelp) { | 109 EnableSettingsWindowHidesSettingsAndHelp) { |
110 base::CommandLine::ForCurrentProcess()->AppendSwitch( | 110 base::CommandLine::ForCurrentProcess()->AppendSwitch( |
111 ::switches::kEnableSettingsWindow); | 111 ::switches::kEnableSettingsWindow); |
112 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIUberFrameURL)); | 112 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIUberFrameURL)); |
113 SelectTab(); | 113 SelectTab(); |
114 EXPECT_TRUE(GetJsBool("$('settings').hidden && $('help').hidden")); | 114 EXPECT_TRUE(GetJsBool("$('settings').hidden && $('help').hidden")); |
115 } | 115 } |
OLD | NEW |