chrome/browser/extensions/extension_browsertest.h - 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/extension_browsertest.h

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/extension_browsertest.h

diff --git a/chrome/browser/extensions/extension_browsertest.h b/chrome/browser/extensions/extension_browsertest.h

index 264069694166c79a2c858b1c055da1c46606e0d6..cc715e76915f0064df35695b694ea7cc0173073c 100644

--- a/chrome/browser/extensions/extension_browsertest.h

+++ b/chrome/browser/extensions/extension_browsertest.h

@@ -16,7 +16,7 @@

#include "chrome/browser/ui/browser.h"

#include "chrome/common/extensions/extension.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/manifest.h"

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

#include "content/public/browser/notification_details.h"

@@ -297,7 +297,7 @@ class ExtensionBrowserTest : virtual public InProcessBrowserTest,

int target_visible_page_action_count_;

// Make the current channel "dev" for the duration of the test.

- extensions::Feature::ScopedCurrentChannel current_channel_;

+ extensions::ScopedCurrentChannel current_channel_;

// Disable external install UI.

extensions::FeatureSwitch::ScopedOverride