Move CrxFile, FileReader, ExtensionResource to src/extensions.

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_system.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 "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
+#include "extensions/common/id_util.h"
 #include "sync/api/string_ordinal.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using extensions::Extension;
 using extensions::Manifest;
 
 SyncExtensionHelper::ExtensionState::ExtensionState()
     : enabled_state(ENABLED), incognito_enabled(false) {}
 
 SyncExtensionHelper::ExtensionState::~ExtensionState() {}
 
 bool SyncExtensionHelper::ExtensionState::Equals(
     const SyncExtensionHelper::ExtensionState &other) const {
   return ((enabled_state == other.enabled_state) &&
           (incognito_enabled == other.incognito_enabled));
 }
 
 // static
 SyncExtensionHelper* SyncExtensionHelper::GetInstance() {
   SyncExtensionHelper* instance = Singleton<SyncExtensionHelper>::get();
   instance->SetupIfNecessary(sync_datatype_helper::test());
   return instance;
 }
 
 SyncExtensionHelper::SyncExtensionHelper() : setup_completed_(false) {}
 
 SyncExtensionHelper::~SyncExtensionHelper() {}
 
-// static
-std::string SyncExtensionHelper::NameToId(const std::string& name) {
-  std::string id;
-  EXPECT_TRUE(Extension::GenerateId(name, &id));
-  return id;
-}
-
 void SyncExtensionHelper::SetupIfNecessary(SyncTest* test) {
   if (setup_completed_)
     return;
 
   for (int i = 0; i < test->num_clients(); ++i) {
     SetupProfile(test->GetProfile(i));
   }
   SetupProfile(test->verifier());
 
   setup_completed_ = true;
 }
 
 std::string SyncExtensionHelper::InstallExtension(
     Profile* profile, const std::string& name, Manifest::Type type) {
   scoped_refptr<Extension> extension = GetExtension(profile, name, type);
   if (!extension.get()) {
     NOTREACHED() << "Could not install extension " << name;
     return "";
   }
   profile->GetExtensionService()->OnExtensionInstalled(
       extension, syncer::StringOrdinal(), false /* no requirement errors */,
       false /* don't wait for idle to install */);
   return extension->id();
 }
 
 void SyncExtensionHelper::UninstallExtension(
     Profile* profile, const std::string& name) {
-  ExtensionService::UninstallExtensionHelper(profile->GetExtensionService(),
-                                             NameToId(name));
+  ExtensionService::UninstallExtensionHelper(
+      profile->GetExtensionService(),
+      extensions::id_util::GenerateId(name));
 }
 
 std::vector<std::string> SyncExtensionHelper::GetInstalledExtensionNames(
     Profile* profile) const {
   std::vector<std::string> names;
   ExtensionService* extension_service = profile->GetExtensionService();
 
   scoped_ptr<const ExtensionSet> extensions(
       extension_service->GenerateInstalledExtensionsSet());
   for (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) {
-  profile->GetExtensionService()->EnableExtension(NameToId(name));
+  profile->GetExtensionService()->EnableExtension(
+      extensions::id_util::GenerateId(name));
 }
 
 void SyncExtensionHelper::DisableExtension(Profile* profile,
                                            const std::string& name) {
   profile->GetExtensionService()->DisableExtension(
-      NameToId(name), Extension::DISABLE_USER_ACTION);
+      extensions::id_util::GenerateId(name), Extension::DISABLE_USER_ACTION);
 }
 
 bool SyncExtensionHelper::IsExtensionEnabled(
     Profile* profile, const std::string& name) const {
-  return profile->GetExtensionService()->IsExtensionEnabled(NameToId(name));
+  return profile->GetExtensionService()->IsExtensionEnabled(
+      extensions::id_util::GenerateId(name));
 }
 
 void SyncExtensionHelper::IncognitoEnableExtension(
     Profile* profile, const std::string& name) {
-  profile->GetExtensionService()->SetIsIncognitoEnabled(NameToId(name), true);
+  profile->GetExtensionService()->SetIsIncognitoEnabled(
+      extensions::id_util::GenerateId(name), true);
 }
 
 void SyncExtensionHelper::IncognitoDisableExtension(
     Profile* profile, const std::string& name) {
-  profile->GetExtensionService()->SetIsIncognitoEnabled(NameToId(name), false);
+  profile->GetExtensionService()->SetIsIncognitoEnabled(
+      extensions::id_util::GenerateId(name), false);
 }
 
 bool SyncExtensionHelper::IsIncognitoEnabled(
     Profile* profile, const std::string& name) const {
-  return profile->GetExtensionService()->IsIncognitoEnabled(NameToId(name));
+  return profile->GetExtensionService()->IsIncognitoEnabled(
+      extensions::id_util::GenerateId(name));
 }
 
 
 bool SyncExtensionHelper::IsExtensionPendingInstallForSync(
     Profile* profile, const std::string& id) const {
   const extensions::PendingExtensionManager* pending_extension_manager =
       profile->GetExtensionService()->pending_extension_manager();
   const extensions::PendingExtensionInfo* info =
       pending_extension_manager->GetById(id);
   if (!info)
@@ skipping 214 matching lines @@
     return it2->second;
   }
 
   scoped_refptr<Extension> extension =
       CreateExtension(profile->GetExtensionService()->install_directory(),
                       name, type);
   if (!extension.get()) {
     ADD_FAILURE();
     return NULL;
   }
-  const std::string& expected_id = NameToId(name);
+  const std::string& expected_id = extensions::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;
 }