| 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/feature_list.h" | 9 #include "base/feature_list.h" |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| 11 #include "chrome/browser/extensions/extension_service.h" | 11 #include "chrome/browser/extensions/extension_service.h" |
| 12 #include "chrome/browser/extensions/test_extension_system.h" | 12 #include "chrome/browser/extensions/test_extension_system.h" |
| 13 #include "chrome/browser/profiles/profile.h" | 13 #include "chrome/browser/profiles/profile.h" |
| 14 #include "chrome/browser/ui/browser.h" | 14 #include "chrome/browser/ui/browser.h" |
| 15 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 15 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 16 #include "chrome/browser/ui/webui/md_history_ui.h" |
| 16 #include "chrome/common/chrome_features.h" | 17 #include "chrome/common/chrome_features.h" |
| 17 #include "chrome/common/chrome_switches.h" | 18 #include "chrome/common/chrome_switches.h" |
| 18 #include "chrome/common/url_constants.h" | 19 #include "chrome/common/url_constants.h" |
| 19 #include "chrome/test/base/ui_test_utils.h" | 20 #include "chrome/test/base/ui_test_utils.h" |
| 20 #include "chrome/test/base/web_ui_browser_test.h" | 21 #include "chrome/test/base/web_ui_browser_test.h" |
| 21 #include "content/public/common/content_switches.h" | 22 #include "content/public/common/content_switches.h" |
| 22 #include "content/public/test/browser_test_utils.h" | 23 #include "content/public/test/browser_test_utils.h" |
| 23 #include "extensions/browser/extension_registry.h" | 24 #include "extensions/browser/extension_registry.h" |
| 24 #include "extensions/common/extension.h" | 25 #include "extensions/common/extension.h" |
| 25 #include "extensions/common/extension_builder.h" | 26 #include "extensions/common/extension_builder.h" |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 92 features::kMaterialDesignExtensions.name, ""); | 93 features::kMaterialDesignExtensions.name, ""); |
| 93 base::FeatureList::ClearInstanceForTesting(); | 94 base::FeatureList::ClearInstanceForTesting(); |
| 94 base::FeatureList::SetInstance(std::move(feature_list)); | 95 base::FeatureList::SetInstance(std::move(feature_list)); |
| 95 | 96 |
| 96 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIUberFrameURL)); | 97 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIUberFrameURL)); |
| 97 SelectTab(); | 98 SelectTab(); |
| 98 EXPECT_TRUE(GetJsBool("$('extensions').hidden")); | 99 EXPECT_TRUE(GetJsBool("$('extensions').hidden")); |
| 99 } | 100 } |
| 100 | 101 |
| 101 IN_PROC_BROWSER_TEST_F(UberUIBrowserTest, EnableMdHistoryHidesHistory) { | 102 IN_PROC_BROWSER_TEST_F(UberUIBrowserTest, EnableMdHistoryHidesHistory) { |
| 102 std::unique_ptr<base::FeatureList> feature_list(new base::FeatureList); | 103 MdHistoryUI::SetEnabledForTesting(true); |
| 103 feature_list->InitializeFromCommandLine( | |
| 104 features::kMaterialDesignHistory.name, ""); | |
| 105 base::FeatureList::ClearInstanceForTesting(); | |
| 106 base::FeatureList::SetInstance(std::move(feature_list)); | |
| 107 | 104 |
| 108 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIUberFrameURL)); | 105 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIUberFrameURL)); |
| 109 SelectTab(); | 106 SelectTab(); |
| 110 EXPECT_TRUE(GetJsBool("$('history').hidden")); | 107 EXPECT_TRUE(GetJsBool("$('history').hidden")); |
| 111 } | 108 } |
| 112 | 109 |
| 113 IN_PROC_BROWSER_TEST_F(UberUIBrowserTest, EnableMdSettingsHidesSettings) { | 110 IN_PROC_BROWSER_TEST_F(UberUIBrowserTest, EnableMdSettingsHidesSettings) { |
| 114 std::unique_ptr<base::FeatureList> feature_list(new base::FeatureList); | 111 std::unique_ptr<base::FeatureList> feature_list(new base::FeatureList); |
| 115 feature_list->InitializeFromCommandLine( | 112 feature_list->InitializeFromCommandLine( |
| 116 features::kMaterialDesignSettings.name, ""); | 113 features::kMaterialDesignSettings.name, ""); |
| 117 base::FeatureList::ClearInstanceForTesting(); | 114 base::FeatureList::ClearInstanceForTesting(); |
| 118 base::FeatureList::SetInstance(std::move(feature_list)); | 115 base::FeatureList::SetInstance(std::move(feature_list)); |
| 119 | 116 |
| 120 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIUberFrameURL)); | 117 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIUberFrameURL)); |
| 121 SelectTab(); | 118 SelectTab(); |
| 122 EXPECT_TRUE(GetJsBool("$('settings').hidden && $('help').hidden")); | 119 EXPECT_TRUE(GetJsBool("$('settings').hidden && $('help').hidden")); |
| 123 } | 120 } |
| 124 | 121 |
| 125 IN_PROC_BROWSER_TEST_F(UberUIBrowserTest, | 122 IN_PROC_BROWSER_TEST_F(UberUIBrowserTest, |
| 126 EnableSettingsWindowHidesSettingsAndHelp) { | 123 EnableSettingsWindowHidesSettingsAndHelp) { |
| 127 base::CommandLine::ForCurrentProcess()->AppendSwitch( | 124 base::CommandLine::ForCurrentProcess()->AppendSwitch( |
| 128 ::switches::kEnableSettingsWindow); | 125 ::switches::kEnableSettingsWindow); |
| 129 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIUberFrameURL)); | 126 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIUberFrameURL)); |
| 130 SelectTab(); | 127 SelectTab(); |
| 131 EXPECT_TRUE(GetJsBool("$('settings').hidden && $('help').hidden")); | 128 EXPECT_TRUE(GetJsBool("$('settings').hidden && $('help').hidden")); |
| 132 } | 129 } |
| OLD | NEW |