chrome/common/extensions/permissions/permissions_data_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/permissions/permissions_data_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/common/extensions/permissions/permissions_data_unittest.cc

diff --git a/chrome/common/extensions/permissions/permissions_data_unittest.cc b/chrome/common/extensions/permissions/permissions_data_unittest.cc

index a4d1cdaf010a675b8bda41b010936f2a198bfbe1..0127ce6ecddb9758c271570c9ea89119e820dc58 100644

--- a/chrome/common/extensions/permissions/permissions_data_unittest.cc

+++ b/chrome/common/extensions/permissions/permissions_data_unittest.cc

@@ -12,7 +12,7 @@

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

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

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

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

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

#include "chrome/common/extensions/permissions/api_permission.h"

#include "chrome/common/extensions/permissions/permission_set.h"

#include "chrome/common/extensions/permissions/permissions_data.h"

@@ -117,8 +117,7 @@ TEST(ExtensionPermissionsTest, EffectiveHostPermissions) {

TEST(ExtensionPermissionsTest, SocketPermissions) {

// Set feature current channel to appropriate value.

- Feature::ScopedCurrentChannel scoped_channel(

- chrome::VersionInfo::CHANNEL_DEV);

+ ScopedCurrentChannel scoped_channel(chrome::VersionInfo::CHANNEL_DEV);

scoped_refptr<Extension> extension;

std::string error;