Move extension_error_utils.* and url_pattern_set.* into

chrome/common/extensions/extension_error_utils.cc

Index: chrome/common/extensions/extension_error_utils.cc
diff --git a/chrome/common/extensions/extension_error_utils.cc b/chrome/common/extensions/extension_error_utils.cc
deleted file mode 100644
index 42da01ebc66521fba33eb8e041f8b33d4d4ab338..0000000000000000000000000000000000000000
--- a/chrome/common/extensions/extension_error_utils.cc
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright (c) 2011 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/extension_error_utils.h"
-
-#include "base/string_util.h"
-#include "base/utf_string_conversions.h"
-
-std::string ExtensionErrorUtils::FormatErrorMessage(
-    const std::string& format,
-    const std::string& s1) {
-  std::string ret_val = format;
-  ReplaceFirstSubstringAfterOffset(&ret_val, 0, "*", s1);
-  return ret_val;
-}
-
-std::string ExtensionErrorUtils::FormatErrorMessage(
-    const std::string& format,
-    const std::string& s1,
-    const std::string& s2) {
-  std::string ret_val = format;
-  ReplaceFirstSubstringAfterOffset(&ret_val, 0, "*", s1);
-  ReplaceFirstSubstringAfterOffset(&ret_val, 0, "*", s2);
-  return ret_val;
-}
-
-std::string ExtensionErrorUtils::FormatErrorMessage(
-    const std::string& format,
-    const std::string& s1,
-    const std::string& s2,
-    const std::string& s3) {
-  std::string ret_val = format;
-  ReplaceFirstSubstringAfterOffset(&ret_val, 0, "*", s1);
-  ReplaceFirstSubstringAfterOffset(&ret_val, 0, "*", s2);
-  ReplaceFirstSubstringAfterOffset(&ret_val, 0, "*", s3);
-  return ret_val;
-}
-
-string16 ExtensionErrorUtils::FormatErrorMessageUTF16(
-    const std::string& format,
-    const std::string& s1) {
-  std::string ret_val = format;
-  ReplaceFirstSubstringAfterOffset(&ret_val, 0, "*", s1);
-  return UTF8ToUTF16(ret_val);
-}
-
-string16 ExtensionErrorUtils::FormatErrorMessageUTF16(
-    const std::string& format,
-    const std::string& s1,
-    const std::string& s2) {
-  std::string ret_val = format;
-  ReplaceFirstSubstringAfterOffset(&ret_val, 0, "*", s1);
-  ReplaceFirstSubstringAfterOffset(&ret_val, 0, "*", s2);
-  return UTF8ToUTF16(ret_val);
-}
-
-string16 ExtensionErrorUtils::FormatErrorMessageUTF16(
-    const std::string& format,
-    const std::string& s1,
-    const std::string& s2,
-    const std::string& s3) {
-  std::string ret_val = format;
-  ReplaceFirstSubstringAfterOffset(&ret_val, 0, "*", s1);
-  ReplaceFirstSubstringAfterOffset(&ret_val, 0, "*", s2);
-  ReplaceFirstSubstringAfterOffset(&ret_val, 0, "*", s3);
-  return UTF8ToUTF16(ret_val);
-}
-