diff options
| author | kalman@chromium.org <kalman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-09 04:17:26 +0000 |
|---|---|---|
| committer | kalman@chromium.org <kalman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-09 04:17:26 +0000 |
| commit | d69d7b17af4efe5f0d3ff04307209a4e5a8aba88 (patch) | |
| tree | 5e8e0065db529a4909e051e3826f5cee3d9b5eaa /chrome/browser/extensions/script_badge_controller_unittest.cc | |
| parent | 1254edabcf3d1f6366da25abbe8ae975cfd005d4 (diff) | |
| download | chromium_src-d69d7b17af4efe5f0d3ff04307209a4e5a8aba88.zip chromium_src-d69d7b17af4efe5f0d3ff04307209a4e5a8aba88.tar.gz chromium_src-d69d7b17af4efe5f0d3ff04307209a4e5a8aba88.tar.bz2 | |
Properly propagate the current Chrome channel into the Feature system on the
renderer.
BUG=141093
Review URL: https://chromiumcodereview.appspot.com/10826199
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150731 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/script_badge_controller_unittest.cc')
| -rw-r--r-- | chrome/browser/extensions/script_badge_controller_unittest.cc | 6 |
1 files changed, 5 insertions, 1 deletions
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 { |