Move extension_error_utils.* and url_pattern_set.* into

chrome/common/extensions/message_bundle.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/message_bundle.h"
 
 #include <string>
 #include <vector>
 
 #include "base/hash_tables.h"
 #include "base/i18n/rtl.h"
 #include "base/lazy_instance.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
+#include "chrome/common/extensions/extension_l10n_util.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
-#include "chrome/common/extensions/extension_error_utils.h"
-#include "chrome/common/extensions/extension_l10n_util.h"
+#include "extensions/common/error_utils.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace errors = extension_manifest_errors;
 
 namespace extensions {
 
 const char* MessageBundle::kContentKey = "content";
 const char* MessageBundle::kMessageKey = "message";
 const char* MessageBundle::kPlaceholdersKey = "placeholders";
 
@@ skipping 79 matching lines @@
     append_messages[kBidiDirectionKey] = "ltr";
     append_messages[kBidiReversedDirectionKey] = "rtl";
     append_messages[kBidiStartEdgeKey] = kBidiLeftEdgeValue;
     append_messages[kBidiEndEdgeKey] = kBidiRightEdgeValue;
   }
 
   // Add all reserved messages to the dictionary, but check for collisions.
   SubstitutionMap::iterator it = append_messages.begin();
   for (; it != append_messages.end(); ++it) {
     if (ContainsKey(dictionary_, it->first)) {
-      *error = ExtensionErrorUtils::FormatErrorMessage(
+      *error = ErrorUtils::FormatErrorMessage(
           errors::kReservedMessageFound, it->first);
       return false;
     } else {
       dictionary_[it->first] = it->second;
     }
   }
 
   return true;
 }
 
@@ skipping 204 matching lines @@
 L10nMessagesMap* GetL10nMessagesMap(const std::string& extension_id) {
   ExtensionToL10nMessagesMap::iterator it =
       g_extension_to_messages_map.Get().messages_map.find(extension_id);
   if (it != g_extension_to_messages_map.Get().messages_map.end())
     return &(it->second);
 
   return NULL;
 }
 
 }  // namespace extensions