Move extension_error_utils.* and url_pattern_set.* into

chrome/browser/extensions/api/preference/preference_api.cc

Index: chrome/browser/extensions/api/preference/preference_api.cc
diff --git a/chrome/browser/extensions/api/preference/preference_api.cc b/chrome/browser/extensions/api/preference/preference_api.cc
index 46e6751d1e82fbc313ef9bb1bdf6309ada254139..b5e8cf36248794ffb8b9e104e3c803b0d7fba3cb 100644
--- a/chrome/browser/extensions/api/preference/preference_api.cc
+++ b/chrome/browser/extensions/api/preference/preference_api.cc
@@ -20,11 +20,11 @@
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_notification_types.h"
-#include "chrome/common/extensions/extension_error_utils.h"
 #include "chrome/common/extensions/permissions/api_permission.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
+#include "extensions/common/extension_error_utils.h"
 
 namespace keys = extensions::preference_api_constants;
 namespace helpers = extensions::preference_helpers;
@@ -281,7 +281,7 @@ void PreferenceEventRouter::OnPrefChanged(PrefServiceBase* pref_service,
       transformer->BrowserToExtensionPref(pref->GetValue());
   if (!transformed_value) {
     LOG(ERROR) <<
-        ExtensionErrorUtils::FormatErrorMessage(kConversionErrorMessage,
+        ErrorUtils::FormatErrorMessage(kConversionErrorMessage,
                                                 pref->name());
     return;
   }
@@ -311,7 +311,7 @@ bool PreferenceFunction::ValidateBrowserPref(
       PrefMapping::GetInstance()->FindBrowserPrefForExtensionPref(
           extension_pref_key, browser_pref_key, &permission));
   if (!GetExtension()->HasAPIPermission(permission)) {
-    error_ = ExtensionErrorUtils::FormatErrorMessage(
+    error_ = ErrorUtils::FormatErrorMessage(
         keys::kPermissionErrorMessage, extension_pref_key);
     return false;
   }
@@ -362,7 +362,7 @@ bool GetPreferenceFunction::RunImpl() {
       transformer->BrowserToExtensionPref(pref->GetValue());
   if (!transformed_value) {
     LOG(ERROR) <<
-        ExtensionErrorUtils::FormatErrorMessage(kConversionErrorMessage,
+        ErrorUtils::FormatErrorMessage(kConversionErrorMessage,
                                                 pref->name());
     return false;
   }
@@ -455,7 +455,7 @@ bool SetPreferenceFunction::RunImpl() {
   scoped_ptr<Value> extensionPrefValue(
       transformer->BrowserToExtensionPref(browser_pref_value.get()));
   if (!extensionPrefValue) {
-    error_ =  ExtensionErrorUtils::FormatErrorMessage(kConversionErrorMessage,
+    error_ =  ErrorUtils::FormatErrorMessage(kConversionErrorMessage,
                                                       pref->name());
     bad_message_ = true;
     return false;