Move extension_error_utils.* and url_pattern_set.* into

chrome/common/extensions/manifest_tests/extension_manifests_filebrowser_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 "chrome/common/extensions/extension.h"
-#include "chrome/common/extensions/extension_error_utils.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/extensions/file_browser_handler.h"
+#include "extensions/common/error_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using extensions::ErrorUtils;
 using extensions::Extension;
+using extensions::URLPatternSet;
 
 namespace errors = extension_manifest_errors;
 
 TEST_F(ExtensionManifestTest, FileBrowserHandlers) {
   Testcase testcases[] = {
     Testcase("filebrowser_invalid_access_permission.json",
-             ExtensionErrorUtils::FormatErrorMessage(
+             ErrorUtils::FormatErrorMessage(
                  errors::kInvalidFileAccessValue, base::IntToString(1))),
     Testcase("filebrowser_invalid_access_permission_list.json",
              errors::kInvalidFileAccessList),
     Testcase("filebrowser_invalid_empty_access_permission_list.json",
              errors::kInvalidFileAccessList),
     Testcase("filebrowser_invalid_actions_1.json",
              errors::kInvalidFileBrowserHandler),
     Testcase("filebrowser_invalid_actions_2.json",
              errors::kInvalidFileBrowserHandler),
     Testcase("filebrowser_invalid_action_id.json",
              errors::kInvalidPageActionId),
     Testcase("filebrowser_invalid_action_title.json",
              errors::kInvalidPageActionDefaultTitle),
     Testcase("filebrowser_invalid_file_filters_1.json",
              errors::kInvalidFileFiltersList),
     Testcase("filebrowser_invalid_file_filters_2.json",
-             ExtensionErrorUtils::FormatErrorMessage(
+             ErrorUtils::FormatErrorMessage(
                 errors::kInvalidFileFilterValue, base::IntToString(0))),
     Testcase("filebrowser_invalid_file_filters_url.json",
-             ExtensionErrorUtils::FormatErrorMessage(
+             ErrorUtils::FormatErrorMessage(
                 errors::kInvalidURLPatternError, "http:*.html"))
   };
   RunTestcases(testcases, arraysize(testcases),
                EXPECT_TYPE_ERROR);
 
   scoped_refptr<Extension> extension(
       LoadAndExpectSuccess("filebrowser_valid.json"));
   ASSERT_TRUE(extension.get());
   ASSERT_TRUE(extension->file_browser_handlers() != NULL);
   ASSERT_EQ(extension->file_browser_handlers()->size(), 1U);
@@ skipping 32 matching lines @@
 #if defined(FILE_MANAGER_EXTENSION)
   EXPECT_EQ("", error);
 #else
   EXPECT_EQ(std::string(errors::kInvalidChromeURLOverrides), error);
 #endif
 
   // Extensions of other types can't ovverride chrome://files/ URL.
   LoadAndExpectError("filebrowser_url_override.json",
                      errors::kInvalidChromeURLOverrides);
 }