chrome/common/extensions/manifest_tests/extension_manifests_browseraction_unittest.cc - Issue 11312228: Move extension_error_utils.* and url_pattern_set.* into

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_browseraction_unittest.cc

Issue 11312228: Move extension_error_utils.* and url_pattern_set.* into (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: hate Created 8 years, 1 month 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_manifests_background_unittest.cc ('k') | chrome/common/extensions/manifest_tests/extension_manifests_contentscript_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_browseraction_unittest.cc

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

index f51b002d2d67c14fbf53bba45f67157826ec191f..d6e9fb7277a96d6a3d64ad1edf159888ad7d7d9b 100644

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

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

@@ -3,11 +3,11 @@

// found in the LICENSE file.

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

-#include "chrome/common/extensions/extension_error_utils.h"

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

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

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

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

+#include "extensions/common/error_utils.h"

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

namespace errors = extension_manifest_errors;

@@ -93,7 +93,7 @@ TEST_F(ExtensionManifestTest, BrowserActionManifestIcons_InvalidDefaultIcon) {

.Set("38", "icon38.png")))

.Build();

- string16 error = ExtensionErrorUtils::FormatErrorMessageUTF16(

+ string16 error = ErrorUtils::FormatErrorMessageUTF16(

errors::kInvalidIconPath, "19");

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

errors::kInvalidIconPath);