Move extension_error_utils.* and url_pattern_set.* into

chrome/common/extensions/message_bundle_unittest.cc

Index: chrome/common/extensions/message_bundle_unittest.cc
diff --git a/chrome/common/extensions/message_bundle_unittest.cc b/chrome/common/extensions/message_bundle_unittest.cc
index 1d313a1cb41145de9d387d2d92bd99781959576e..f3accea67491dd16fcbecd15f46ab65915a4dd57 100644
--- a/chrome/common/extensions/message_bundle_unittest.cc
+++ b/chrome/common/extensions/message_bundle_unittest.cc
@@ -13,9 +13,9 @@
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.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 "chrome/common/extensions/extension_manifest_constants.h"
+#include "extensions/common/error_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace errors = extension_manifest_errors;
@@ -265,7 +265,7 @@ TEST_F(MessageBundleTest, ReservedMessagesOverrideDeveloperMessages) {
   std::string error = CreateMessageBundle();
 
   EXPECT_TRUE(handler_.get() == NULL);
-  std::string expected_error = ExtensionErrorUtils::FormatErrorMessage(
+  std::string expected_error = ErrorUtils::FormatErrorMessage(
       errors::kReservedMessageFound, MessageBundle::kUILocaleKey);
   EXPECT_EQ(expected_error, error);
 }