chrome/browser/extensions/api/extension_action/script_badge_apitest.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/api/extension_action/script_badge_apitest.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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/extensions/api/declarative_content/declarative_content_apitest.cc ('k') | chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/extension_action/script_badge_apitest.cc

diff --git a/chrome/browser/extensions/api/extension_action/script_badge_apitest.cc b/chrome/browser/extensions/api/extension_action/script_badge_apitest.cc

index c30884d105b924ef6c2444de98f03b9a2ea5e688..fd7264a117a32b7e992fbe2f0ce2d57d993cf3f3 100644

--- a/chrome/browser/extensions/api/extension_action/script_badge_apitest.cc

+++ b/chrome/browser/extensions/api/extension_action/script_badge_apitest.cc

@@ -15,7 +15,7 @@

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

#include "chrome/common/chrome_switches.h"

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

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

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

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

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

#include "net/dns/mock_host_resolver.h"

@@ -36,7 +36,7 @@ class ScriptBadgeApiTest : public ExtensionApiTest {

}

private:

- extensions::Feature::ScopedCurrentChannel trunk_;

+ extensions::ScopedCurrentChannel trunk_;

};

IN_PROC_BROWSER_TEST_F(ScriptBadgeApiTest, Basics) {