chrome/common/extensions/manifest_handlers/externally_connectable_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/common/extensions/manifest_handlers/externally_connectable_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:

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

Download patch

« no previous file with comments | « chrome/common/extensions/features/simple_feature_unittest.cc ('k') | chrome/common/extensions/manifest_tests/extension_manifest_test.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/manifest_handlers/externally_connectable_unittest.cc

diff --git a/chrome/common/extensions/manifest_handlers/externally_connectable_unittest.cc b/chrome/common/extensions/manifest_handlers/externally_connectable_unittest.cc

index feea601135a51c0a6a337010501a7c2e5a7848f1..78857c21b354189b4bcb0f8cb1be2849281ec157 100644

--- a/chrome/common/extensions/manifest_handlers/externally_connectable_unittest.cc

+++ b/chrome/common/extensions/manifest_handlers/externally_connectable_unittest.cc

@@ -5,7 +5,7 @@

#include <algorithm>

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

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

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

#include "chrome/common/extensions/manifest_handlers/externally_connectable.h"

#include "chrome/common/extensions/manifest_tests/extension_manifest_test.h"

#include "extensions/common/error_utils.h"

@@ -30,7 +30,7 @@ class ExternallyConnectableTest : public ExtensionManifestTest {

}

private:

- Feature::ScopedCurrentChannel channel_;

+ ScopedCurrentChannel channel_;

};

TEST_F(ExternallyConnectableTest, IDsAndMatches) {