chrome/common/extensions/manifest_tests/extension_manifests_web_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_web_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_validapp_unittest.cc ('k') | chrome/common/extensions/manifest_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_web_unittest.cc

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

index e6fc6e7a6f4be1f42cf4947e0c1a562809a8418b..8ce9af80d1cf8507ae6db84a07ed2951ecd75127 100644

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

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

@@ -6,11 +6,12 @@

#include "base/string_number_conversions.h"

#include "base/utf_string_conversions.h"

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

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

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

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

#include "webkit/glue/web_intent_service_data.h"

+using extensions::ErrorUtils;

using extensions::Extension;

namespace errors = extension_manifest_errors;

@@ -214,28 +215,28 @@ TEST_F(ExtensionManifestTest, AppWebUrls) {

Testcase testcases[] = {

Testcase("web_urls_wrong_type.json", errors::kInvalidWebURLs),

Testcase("web_urls_invalid_1.json",

- ExtensionErrorUtils::FormatErrorMessage(

+ ErrorUtils::FormatErrorMessage(

errors::kInvalidWebURL,

base::IntToString(0),

errors::kExpectString)),

Testcase("web_urls_invalid_2.json",

- ExtensionErrorUtils::FormatErrorMessage(

+ ErrorUtils::FormatErrorMessage(

errors::kInvalidWebURL,

base::IntToString(0),

URLPattern::GetParseResultString(

URLPattern::PARSE_ERROR_MISSING_SCHEME_SEPARATOR))),

Testcase("web_urls_invalid_3.json",

- ExtensionErrorUtils::FormatErrorMessage(

+ ErrorUtils::FormatErrorMessage(

errors::kInvalidWebURL,

base::IntToString(0),

errors::kNoWildCardsInPaths)),

Testcase("web_urls_invalid_4.json",

- ExtensionErrorUtils::FormatErrorMessage(

+ ErrorUtils::FormatErrorMessage(

errors::kInvalidWebURL,

base::IntToString(0),

errors::kCannotClaimAllURLsInExtent)),

Testcase("web_urls_invalid_5.json",

- ExtensionErrorUtils::FormatErrorMessage(

+ ErrorUtils::FormatErrorMessage(

errors::kInvalidWebURL,

base::IntToString(1),

errors::kCannotClaimAllHostsInExtent))