Move extension_error_utils.* and url_pattern_set.* into

chrome/common/extensions/manifest_tests/extension_manifests_web_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h"
 
 #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/extension_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;
 
 TEST_F(ExtensionManifestTest, WebAccessibleResources) {
   // Manifest version 2 with web accessible resources specified.
   scoped_refptr<Extension> extension1(
       LoadAndExpectSuccess("web_accessible_resources_1.json"));
 
   // Manifest version 2 with no web accessible resources.
@@ skipping 183 matching lines @@
   ASSERT_EQ(1u, extension->intents_services().size());
   EXPECT_EQ("chrome-extension",
       extension->intents_services()[0].service_url.scheme());
   EXPECT_EQ("/main.html",extension->intents_services()[0].service_url.path());
 }
 
 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))
   };
   RunTestcases(testcases, arraysize(testcases),
                EXPECT_TYPE_ERROR);
 
   LoadAndExpectSuccess("web_urls_has_port.json");
 
   scoped_refptr<Extension> extension(
       LoadAndExpectSuccess("web_urls_default.json"));
   ASSERT_EQ(1u, extension->web_extent().patterns().size());
   EXPECT_EQ("*://www.google.com/*",
             extension->web_extent().patterns().begin()->GetAsString());
 }