chrome/common/extensions/api/extension_action/browser_action_manifest_unittest.cc - Issue 578653005: Revert "Refactor ExtensionManifestTest to allow usage in src/extensions"

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/api/extension_action/browser_action_manifest_unittest.cc

Issue 578653005: Revert "Refactor ExtensionManifestTest to allow usage in src/extensions" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 3 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/api/commands/commands_manifest_unittest.cc ('k') | chrome/common/extensions/api/extension_action/page_action_manifest_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/api/extension_action/browser_action_manifest_unittest.cc

diff --git a/chrome/common/extensions/api/extension_action/browser_action_manifest_unittest.cc b/chrome/common/extensions/api/extension_action/browser_action_manifest_unittest.cc

index 98544f8ab498fbf178d875178ab9e0ab6b761342..f69ae147fa25a0a559ab792038bd0fc3a9a601c3 100644

--- a/chrome/common/extensions/api/extension_action/browser_action_manifest_unittest.cc

+++ b/chrome/common/extensions/api/extension_action/browser_action_manifest_unittest.cc

@@ -3,7 +3,7 @@

// found in the LICENSE file.

#include "chrome/common/extensions/api/extension_action/action_info.h"

-#include "chrome/common/extensions/manifest_tests/chrome_manifest_test.h"

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

#include "extensions/common/error_utils.h"

#include "extensions/common/extension_builder.h"

#include "extensions/common/extension_icon_set.h"

@@ -17,7 +17,7 @@ namespace errors = manifest_errors;

namespace {

-class BrowserActionManifestTest : public ChromeManifestTest {

+class BrowserActionManifestTest : public ExtensionManifestTest {

};

TEST_F(BrowserActionManifestTest,

@@ -105,7 +105,7 @@ TEST_F(BrowserActionManifestTest,

base::string16 error = ErrorUtils::FormatErrorMessageUTF16(

errors::kInvalidIconPath, "19");

- LoadAndExpectError(ManifestData(manifest_value.get(), "Invalid default icon"),

+ LoadAndExpectError(Manifest(manifest_value.get(), "Invalid default icon"),

errors::kInvalidIconPath);

}