chrome/common/extensions/manifest_tests/extension_manifests_background_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_tests/extension_manifests_background_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/manifest_tests/extension_manifest_test.h ('k') | chrome/common/extensions/permissions/permission_set_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/manifest_tests/extension_manifests_background_unittest.cc

diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_background_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_background_unittest.cc

index 10ddbe30542d1fe83870f9a676a37479118c9128..d2d4fc7951467e67697bb587442a500429d3d25b 100644

--- a/chrome/common/extensions/manifest_tests/extension_manifests_background_unittest.cc

+++ b/chrome/common/extensions/manifest_tests/extension_manifests_background_unittest.cc

@@ -10,8 +10,7 @@

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

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

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

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

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

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

#include "extensions/common/constants.h"

#include "extensions/common/error_utils.h"

#include "testing/gtest/include/gtest/gtest.h"

@@ -89,8 +88,7 @@ TEST_F(ExtensionManifestBackgroundTest, BackgroundAllowNoJsAccess) {

}

TEST_F(ExtensionManifestBackgroundTest, BackgroundPageWebRequest) {

- Feature::ScopedCurrentChannel current_channel(

- chrome::VersionInfo::CHANNEL_DEV);

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

std::string error;

scoped_ptr<base::DictionaryValue> manifest(