diff options
Diffstat (limited to 'chrome/browser')
4 files changed, 11 insertions, 16 deletions
diff --git a/chrome/browser/extensions/active_tab_unittest.cc b/chrome/browser/extensions/active_tab_unittest.cc index 35e5e48..8d89be6 100644 --- a/chrome/browser/extensions/active_tab_unittest.cc +++ b/chrome/browser/extensions/active_tab_unittest.cc @@ -58,13 +58,8 @@ class ActiveTabTest : public TabContentsTestHarness { : extension(CreateTestExtension("deadbeef", true)), another_extension(CreateTestExtension("feedbeef", true)), extension_without_active_tab(CreateTestExtension("badbeef", false)), - ui_thread_(BrowserThread::UI, MessageLoop::current()) { - } - - virtual void SetUp() { - TabContentsTestHarness::SetUp(); - Feature::SetChannelForTesting(chrome::VersionInfo::CHANNEL_UNKNOWN); - } + ui_thread_(BrowserThread::UI, MessageLoop::current()), + current_channel_(chrome::VersionInfo::CHANNEL_DEV) {} protected: int tab_id() { @@ -122,6 +117,7 @@ class ActiveTabTest : public TabContentsTestHarness { private: content::TestBrowserThread ui_thread_; + Feature::ScopedCurrentChannel current_channel_; }; TEST_F(ActiveTabTest, GrantToSinglePage) { diff --git a/chrome/browser/extensions/extension_browsertest.cc b/chrome/browser/extensions/extension_browsertest.cc index e5cd7f5..31f0682 100644 --- a/chrome/browser/extensions/extension_browsertest.cc +++ b/chrome/browser/extensions/extension_browsertest.cc @@ -29,7 +29,7 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/features/feature.h" +#include "chrome/common/chrome_version_info.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_entry.h" @@ -57,9 +57,6 @@ ExtensionBrowserTest::~ExtensionBrowserTest() { } void ExtensionBrowserTest::SetUpCommandLine(CommandLine* command_line) { - extensions::Feature::SetChannelForTesting( - chrome::VersionInfo::CHANNEL_UNKNOWN); - PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_); test_data_dir_ = test_data_dir_.AppendASCII("extensions"); diff --git a/chrome/browser/extensions/extension_system.cc b/chrome/browser/extensions/extension_system.cc index b451ab0..8b8756c 100644 --- a/chrome/browser/extensions/extension_system.cc +++ b/chrome/browser/extensions/extension_system.cc @@ -36,6 +36,7 @@ #include "chrome/browser/ui/webui/chrome_url_data_manager.h" #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" #include "chrome/common/chrome_switches.h" +#include "chrome/common/chrome_version_info.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/features/feature.h" #include "chrome/common/pref_names.h" @@ -50,10 +51,7 @@ namespace extensions { // ExtensionSystem::ExtensionSystem() { - // In lieu of a way for Feature to check whether it's running on the browser - // process, tell it. - // See http://crbug.com/126535. - Feature::SetChannelCheckingEnabled(true); + Feature::SetCurrentChannel(chrome::VersionInfo::GetChannel()); } ExtensionSystem::~ExtensionSystem() { diff --git a/chrome/browser/extensions/script_badge_controller_unittest.cc b/chrome/browser/extensions/script_badge_controller_unittest.cc index 7ed0f23..ef51f1e 100644 --- a/chrome/browser/extensions/script_badge_controller_unittest.cc +++ b/chrome/browser/extensions/script_badge_controller_unittest.cc @@ -15,8 +15,10 @@ #include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/browser/ui/tab_contents/test_tab_contents.h" #include "chrome/common/chrome_notification_types.h" +#include "chrome/common/chrome_version_info.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_builder.h" +#include "chrome/common/extensions/features/feature.h" #include "chrome/common/extensions/value_builder.h" #include "chrome/test/base/testing_profile.h" #include "content/public/browser/browser_thread.h" @@ -36,7 +38,8 @@ class ScriptBadgeControllerTest : public TabContentsTestHarness { public: ScriptBadgeControllerTest() : ui_thread_(BrowserThread::UI, MessageLoop::current()), - file_thread_(BrowserThread::FILE, MessageLoop::current()) {} + file_thread_(BrowserThread::FILE, MessageLoop::current()), + current_channel_(chrome::VersionInfo::CHANNEL_DEV) {} virtual void SetUp() OVERRIDE { // Note that this sets a PageActionController into the @@ -83,6 +86,7 @@ class ScriptBadgeControllerTest : public TabContentsTestHarness { private: content::TestBrowserThread ui_thread_; content::TestBrowserThread file_thread_; + Feature::ScopedCurrentChannel current_channel_; }; struct CountingNotificationObserver : public content::NotificationObserver { |