chrome/browser/extensions/script_badge_controller_unittest.cc - Issue 22299009: Move channel-related (Chrome-specific) global state out of Feature.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 22299009: Move channel-related (Chrome-specific) global state out of Feature. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 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:

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 9b0eddcb278f1093a04ada9b01f1ec653f5eb256..01bfd60478bc427979266a4cda390e9d974df118 100644

--- a/chrome/browser/extensions/script_badge_controller_unittest.cc

+++ b/chrome/browser/extensions/script_badge_controller_unittest.cc

@@ -19,7 +19,7 @@

#include "chrome/common/extensions/extension.h"

#include "chrome/common/extensions/extension_builder.h"

#include "chrome/common/extensions/feature_switch.h"

-#include "chrome/common/extensions/features/feature.h"

+#include "chrome/common/extensions/features/feature_channel.h"

#include "chrome/common/extensions/value_builder.h"

#include "chrome/test/base/chrome_render_view_host_test_harness.h"

#include "chrome/test/base/testing_profile.h"

@@ -105,7 +105,7 @@ class ScriptBadgeControllerTest : public ChromeRenderViewHostTestHarness {

private:

FeatureSwitch::ScopedOverride feature_override_;

- Feature::ScopedCurrentChannel current_channel_;

+ ScopedCurrentChannel current_channel_;

#if defined OS_CHROMEOS

chromeos::ScopedTestDeviceSettingsService test_device_settings_service_;

« no previous file with comments | « chrome/browser/extensions/extension_system.cc ('k') | chrome/chrome_common.gypi » ('j') | no next file with comments »