Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1910)

Unified Diff: chrome/browser/extensions/script_badge_controller_unittest.cc

Issue 10826199: Properly propagate the current Chrome channel into the Feature system on the (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: make the default stable Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/extension_system.cc ('k') | chrome/common/extensions/features/feature.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/script_badge_controller_unittest.cc
diff --git a/chrome/browser/extensions/script_badge_controller_unittest.cc b/chrome/browser/extensions/script_badge_controller_unittest.cc
index 7ed0f23913e244bd495178497884629a9a38fa95..ef51f1e7b2e83a35aff84a22fa360c8644f891a0 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 {
« no previous file with comments | « chrome/browser/extensions/extension_system.cc ('k') | chrome/common/extensions/features/feature.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698