Extensions: Move id_util functions to crx_file component.

chrome/browser/sync/test/integration/sync_extension_helper.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/browser/sync/test/integration/sync_extension_helper.h"
 
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/extensions/pending_extension_info.h"
 #include "chrome/browser/extensions/pending_extension_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
+#include "components/crx_file/id_util.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/install_flag.h"
 #include "extensions/browser/uninstall_reason.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_set.h"
-#include "extensions/common/id_util.h"
 #include "extensions/common/manifest_constants.h"
 #include "sync/api/string_ordinal.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using extensions::Extension;
 using extensions::ExtensionRegistry;
 using extensions::Manifest;
 
 SyncExtensionHelper::ExtensionState::ExtensionState()
     : enabled_state(ENABLED), incognito_enabled(false) {}
@@ skipping 41 matching lines @@
       ->OnExtensionInstalled(extension.get(),
                              syncer::StringOrdinal(),
                              extensions::kInstallFlagInstallImmediately);
   return extension->id();
 }
 
 void SyncExtensionHelper::UninstallExtension(
     Profile* profile, const std::string& name) {
   ExtensionService::UninstallExtensionHelper(
       extensions::ExtensionSystem::Get(profile)->extension_service(),
-      extensions::id_util::GenerateId(name),
+      crx_file::id_util::GenerateId(name),
       extensions::UNINSTALL_REASON_SYNC);
 }
 
 std::vector<std::string> SyncExtensionHelper::GetInstalledExtensionNames(
     Profile* profile) const {
   std::vector<std::string> names;
 
   scoped_ptr<const extensions::ExtensionSet> extensions(
       extensions::ExtensionRegistry::Get(profile)
           ->GenerateInstalledExtensionsSet());
   for (extensions::ExtensionSet::const_iterator it = extensions->begin();
        it != extensions->end(); ++it) {
     names.push_back((*it)->name());
   }
 
   return names;
 }
 
 void SyncExtensionHelper::EnableExtension(Profile* profile,
                                           const std::string& name) {
   extensions::ExtensionSystem::Get(profile)
       ->extension_service()
-      ->EnableExtension(extensions::id_util::GenerateId(name));
+      ->EnableExtension(crx_file::id_util::GenerateId(name));
 }
 
 void SyncExtensionHelper::DisableExtension(Profile* profile,
                                            const std::string& name) {
   extensions::ExtensionSystem::Get(profile)
       ->extension_service()
-      ->DisableExtension(extensions::id_util::GenerateId(name),
+      ->DisableExtension(crx_file::id_util::GenerateId(name),
                          Extension::DISABLE_USER_ACTION);
 }
 
 bool SyncExtensionHelper::IsExtensionEnabled(
     Profile* profile, const std::string& name) const {
   return extensions::ExtensionSystem::Get(profile)
       ->extension_service()
-      ->IsExtensionEnabled(extensions::id_util::GenerateId(name));
+      ->IsExtensionEnabled(crx_file::id_util::GenerateId(name));
 }
 
 void SyncExtensionHelper::IncognitoEnableExtension(
     Profile* profile, const std::string& name) {
   extensions::util::SetIsIncognitoEnabled(
-      extensions::id_util::GenerateId(name), profile, true);
+      crx_file::id_util::GenerateId(name), profile, true);
 }
 
 void SyncExtensionHelper::IncognitoDisableExtension(
     Profile* profile, const std::string& name) {
   extensions::util::SetIsIncognitoEnabled(
-      extensions::id_util::GenerateId(name), profile, false);
+      crx_file::id_util::GenerateId(name), profile, false);
 }
 
 bool SyncExtensionHelper::IsIncognitoEnabled(
     Profile* profile, const std::string& name) const {
   return extensions::util::IsIncognitoEnabled(
-      extensions::id_util::GenerateId(name), profile);
+      crx_file::id_util::GenerateId(name), profile);
 }
 
 
 bool SyncExtensionHelper::IsExtensionPendingInstallForSync(
     Profile* profile, const std::string& id) const {
   const extensions::PendingExtensionManager* pending_extension_manager =
       extensions::ExtensionSystem::Get(profile)
           ->extension_service()
           ->pending_extension_manager();
   const extensions::PendingExtensionInfo* info =
@@ skipping 224 matching lines @@
   scoped_refptr<Extension> extension =
       CreateExtension(extensions::ExtensionSystem::Get(profile)
                           ->extension_service()
                           ->install_directory(),
                       name,
                       type);
   if (!extension.get()) {
     ADD_FAILURE();
     return NULL;
   }
-  const std::string& expected_id = extensions::id_util::GenerateId(name);
+  const std::string& expected_id = crx_file::id_util::GenerateId(name);
   if (extension->id() != expected_id) {
     EXPECT_EQ(expected_id, extension->id());
     return NULL;
   }
   DVLOG(2) << "created extension with name = "
            << name << ", id = " << expected_id;
   (it->second)[name] = extension;
   id_to_name_[expected_id] = name;
   id_to_type_[expected_id] = type;
   return extension;
 }