Move extension_error_utils.* and url_pattern_set.* into

extensions/common/url_pattern_set.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/url_pattern_set.h"
+#include "extensions/common/url_pattern_set.h"
 
 #include <algorithm>
 #include <iterator>
 
 #include "base/logging.h"
 #include "base/memory/linked_ptr.h"
 #include "base/values.h"
-#include "chrome/common/extensions/extension_error_utils.h"
 #include "content/public/common/url_constants.h"
+#include "extensions/common/extension_error_utils.h"
 #include "extensions/common/url_pattern.h"
 #include "googleurl/src/gurl.h"
 
+namespace extensions {
+
 namespace {
 
 const char kInvalidURLPatternError[] = "Invalid url pattern '*'";
 
 }  // namespace
 
 // static
 void URLPatternSet::CreateDifference(const URLPatternSet& set1,
                                      const URLPatternSet& set2,
                                      URLPatternSet* out) {
@@ skipping 149 matching lines @@
 
 bool URLPatternSet::Populate(const std::vector<std::string>& patterns,
                              int valid_schemes,
                              bool allow_file_access,
                              std::string* error) {
   ClearPatterns();
   for (size_t i = 0; i < patterns.size(); ++i) {
     URLPattern pattern(valid_schemes);
     if (pattern.Parse(patterns[i]) != URLPattern::PARSE_SUCCESS) {
       if (error) {
-        *error = ExtensionErrorUtils::FormatErrorMessage(
-            kInvalidURLPatternError, patterns[i]);
+        *error = ErrorUtils::FormatErrorMessage(kInvalidURLPatternError,
+                                                patterns[i]);
       } else {
         LOG(ERROR) << "Invalid url pattern: " << patterns[i];
       }
       return false;
     }
     if (!allow_file_access && pattern.MatchesScheme(chrome::kFileScheme)) {
       pattern.SetValidSchemes(
           pattern.valid_schemes() & ~URLPattern::SCHEME_FILE);
     }
     AddPattern(pattern);
   }
   return true;
 }
 
 bool URLPatternSet::Populate(const base::ListValue& value,
                              int valid_schemes,
                              bool allow_file_access,
                              std::string* error) {
   std::vector<std::string> patterns;
   for (size_t i = 0; i < value.GetSize(); ++i) {
     std::string item;
     if (!value.GetString(i, &item))
       return false;
     patterns.push_back(item);
   }
   return Populate(patterns, valid_schemes, allow_file_access, error);
 }
+
+}  // namespace extensions