chrome/common/extensions/manifest_tests/extension_manifests_background_unittest.cc - Issue 12042096: Move page action manifest parsing out of Extension; the first multi-key manifest handler.

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 12042096: Move page action manifest parsing out of Extension; the first multi-key manifest handler. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 10 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.cc ('k') | chrome/common/extensions/manifest_tests/extension_manifests_initvalue_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 d929169e2dd1dd4e67b735aea05db2b95407d995..2913f72edaba9e426bea0bc96ae2fca303aaed2c 100644

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

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

@@ -28,7 +28,7 @@ TEST_F(ExtensionManifestTest, BackgroundPermission) {

TEST_F(ExtensionManifestTest, BackgroundScripts) {

std::string error;

scoped_ptr<DictionaryValue> manifest(

- LoadManifestFile("background_scripts.json", &error));

+ LoadManifest("background_scripts.json", &error));

ASSERT_TRUE(manifest.get());

scoped_refptr<Extension> extension(

@@ -57,7 +57,7 @@ TEST_F(ExtensionManifestTest, BackgroundPage) {

std::string error;

scoped_ptr<DictionaryValue> manifest(

- LoadManifestFile("background_page_legacy.json", &error));

+ LoadManifest("background_page_legacy.json", &error));

ASSERT_TRUE(manifest.get());

extension = LoadAndExpectSuccess(Manifest(manifest.get(), ""));

ASSERT_TRUE(extension);

@@ -88,7 +88,7 @@ TEST_F(ExtensionManifestTest, BackgroundPageWebRequest) {

std::string error;

scoped_ptr<DictionaryValue> manifest(

- LoadManifestFile("background_page.json", &error));

+ LoadManifest("background_page.json", &error));

ASSERT_TRUE(manifest.get());

manifest->SetBoolean(keys::kBackgroundPersistent, false);

manifest->SetInteger(keys::kManifestVersion, 2);