Move extension_error_utils.* and url_pattern_set.* into

chrome/browser/extensions/api/permissions/permissions_api_helpers.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/browser/extensions/api/permissions/permissions_api_helpers.h"
 
 #include "base/values.h"
 #include "chrome/common/extensions/api/permissions.h"
 #include "chrome/common/extensions/extension.h"
-#include "chrome/common/extensions/extension_error_utils.h"
 #include "chrome/common/extensions/permissions/permission_set.h"
 #include "chrome/common/extensions/permissions/permissions_info.h"
-#include "chrome/common/extensions/url_pattern_set.h"
+#include "extensions/common/extension_error_utils.h"
+#include "extensions/common/url_pattern_set.h"
 
 using extensions::APIPermission;
 using extensions::PermissionSet;
 using extensions::PermissionsInfo;
 
 namespace extensions {
 
 using api::permissions::Permissions;
 
 namespace permissions_api_helpers {
@@ skipping 27 matching lines @@
 scoped_refptr<PermissionSet> UnpackPermissionSet(
     const Permissions& permissions, std::string* error) {
   APIPermissionSet apis;
   std::vector<std::string>* permissions_list = permissions.permissions.get();
   if (permissions_list) {
     PermissionsInfo* info = PermissionsInfo::GetInstance();
     for (std::vector<std::string>::iterator it = permissions_list->begin();
         it != permissions_list->end(); ++it) {
       const APIPermissionInfo* permission_info = info->GetByName(*it);
       if (!permission_info) {
-        *error = ExtensionErrorUtils::FormatErrorMessage(
+        *error = ErrorUtils::FormatErrorMessage(
             kUnknownPermissionError, *it);
         return NULL;
       }
       apis.insert(permission_info->id());
     }
   }
 
   URLPatternSet origins;
   if (permissions.origins.get()) {
     for (std::vector<std::string>::iterator it = permissions.origins->begin();
         it != permissions.origins->end(); ++it) {
       URLPattern origin(Extension::kValidHostPermissionSchemes);
       URLPattern::ParseResult parse_result = origin.Parse(*it);
       if (URLPattern::PARSE_SUCCESS != parse_result) {
-        *error = ExtensionErrorUtils::FormatErrorMessage(
+        *error = ErrorUtils::FormatErrorMessage(
             kInvalidOrigin,
             *it,
             URLPattern::GetParseResultString(parse_result));
         return NULL;
       }
       origins.AddPattern(origin);
     }
   }
 
   return scoped_refptr<PermissionSet>(
       new PermissionSet(apis, origins, URLPatternSet()));
 }
 
 }  // namespace permissions_api
 }  // namespace extensions