Extensions: Move id_util functions to crx_file component.

chrome/browser/profile_resetter/brandcoded_default_settings.cc

 // Copyright 2013 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/browser/profile_resetter/brandcoded_default_settings.h"
 
 #include "base/json/json_string_value_serializer.h"
 #include "base/logging.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/installer/util/master_preferences_constants.h"
+#include "components/crx_file/id_util.h"
 #include "components/search_engines/search_engines_pref_names.h"
-#include "extensions/common/extension.h"
 
 BrandcodedDefaultSettings::BrandcodedDefaultSettings() {
 }
 
 BrandcodedDefaultSettings::BrandcodedDefaultSettings(const std::string& prefs) {
   if (!prefs.empty()) {
     JSONStringValueSerializer json(prefs);
     std::string error;
     scoped_ptr<base::Value> root(json.Deserialize(NULL, &error));
     if (!root.get()) {
@@ skipping 41 matching lines @@
 bool BrandcodedDefaultSettings::GetExtensions(
     std::vector<std::string>* extension_ids) const {
   DCHECK(extension_ids);
   base::DictionaryValue* extensions = NULL;
   if (master_dictionary_ &&
       master_dictionary_->GetDictionary(
           installer::master_preferences::kExtensionsBlock,
           &extensions)) {
     for (base::DictionaryValue::Iterator extension_id(*extensions);
          !extension_id.IsAtEnd(); extension_id.Advance()) {
-      if (extensions::Extension::IdIsValid(extension_id.key()))
+      if (crx_file::id_util::IdIsValid(extension_id.key()))
         extension_ids->push_back(extension_id.key());
     }
     return true;
   }
   return false;
 }
 
 bool BrandcodedDefaultSettings::GetRestoreOnStartup(
     int* restore_on_startup) const {
   return master_dictionary_ &&
          master_dictionary_->GetInteger(prefs::kRestoreOnStartup,
                                         restore_on_startup);
 }
 
 scoped_ptr<base::ListValue>
 BrandcodedDefaultSettings::GetUrlsToRestoreOnStartup() const {
   return ExtractList(prefs::kURLsToRestoreOnStartup);
 }
 
 scoped_ptr<base::ListValue> BrandcodedDefaultSettings::ExtractList(
     const char* pref_name) const {
   const base::ListValue* value = NULL;
   if (master_dictionary_ &&
       master_dictionary_->GetList(pref_name, &value) &&
       !value->empty()) {
     return scoped_ptr<base::ListValue>(value->DeepCopy());
   }
   return scoped_ptr<base::ListValue>();
 }