Extensions: Move id_util functions to crx_file component.

chrome/browser/extensions/shared_module_service_unittest.cc

 // Copyright 2014 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 "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_service_test_base.h"
 #include "chrome/browser/extensions/pending_extension_manager.h"
 #include "chrome/browser/extensions/shared_module_service.h"
 #include "chrome/common/extensions/features/feature_channel.h"
+#include "components/crx_file/id_util.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/install_flag.h"
 #include "extensions/browser/uninstall_reason.h"
 #include "extensions/common/extension_builder.h"
-#include "extensions/common/id_util.h"
 #include "extensions/common/value_builder.h"
 #include "sync/api/string_ordinal.h"
 
 namespace extensions {
 
 namespace {
 
 // Return an extension with |id| which imports a module with the given
 // |import_id|.
 scoped_refptr<Extension> CreateExtensionImportingModule(
@@ skipping 65 matching lines @@
   if (!registry()->GetExtensionById(extension->id(),
                                     ExtensionRegistry::ENABLED)) {
     return testing::AssertionFailure() << "Could not install extension.";
   }
 
   return testing::AssertionSuccess();
 }
 
 TEST_F(SharedModuleServiceUnitTest, AddDependentSharedModules) {
   // Create an extension that has a dependency.
-  std::string import_id = id_util::GenerateId("id");
-  std::string extension_id = id_util::GenerateId("extension_id");
+  std::string import_id = crx_file::id_util::GenerateId("id");
+  std::string extension_id = crx_file::id_util::GenerateId("extension_id");
   scoped_refptr<Extension> extension =
       CreateExtensionImportingModule(import_id, extension_id, "1.0");
 
   PendingExtensionManager* pending_extension_manager =
       service()->pending_extension_manager();
 
   // Verify that we don't currently want to install the imported module.
   EXPECT_FALSE(pending_extension_manager->IsIdPending(import_id));
 
   // Try to satisfy imports for the extension. This should queue the imported
   // module's installation.
   service()->shared_module_service()->SatisfyImports(extension);
   EXPECT_TRUE(pending_extension_manager->IsIdPending(import_id));
 }
 
 TEST_F(SharedModuleServiceUnitTest, PruneSharedModulesOnUninstall) {
   // Create a module which exports a resource, and install it.
   scoped_ptr<base::DictionaryValue> manifest =
       DictionaryBuilder()
           .Set("name", "Shared Module")
           .Set("version", "1.0")
           .Set("manifest_version", 2)
           .Set("export",
                DictionaryBuilder().Set("resources",
                                        ListBuilder().Append("foo.js"))).Build();
   scoped_refptr<Extension> shared_module =
-      ExtensionBuilder().SetManifest(manifest.Pass())
-                        .AddFlags(Extension::FROM_WEBSTORE)
-                        .SetID(id_util::GenerateId("shared_module"))
-                        .Build();
+      ExtensionBuilder()
+          .SetManifest(manifest.Pass())
+          .AddFlags(Extension::FROM_WEBSTORE)
+          .SetID(crx_file::id_util::GenerateId("shared_module"))
+          .Build();
 
   EXPECT_TRUE(InstallExtension(shared_module, false));
 
-  std::string extension_id = id_util::GenerateId("extension_id");
+  std::string extension_id = crx_file::id_util::GenerateId("extension_id");
   // Create and install an extension that imports our new module.
   scoped_refptr<Extension> importing_extension =
       CreateExtensionImportingModule(shared_module->id(), extension_id, "1.0");
   EXPECT_TRUE(InstallExtension(importing_extension, false));
 
   // Uninstall the extension that imports our module.
   base::string16 error;
   service()->UninstallExtension(importing_extension->id(),
                                 extensions::UNINSTALL_REASON_FOR_TESTING,
                                 base::Bind(&base::DoNothing),
@@ skipping 11 matching lines @@
   // Create two modules which export a resource, and install them.
   scoped_ptr<base::DictionaryValue> manifest_1 =
       DictionaryBuilder()
           .Set("name", "Shared Module 1")
           .Set("version", "1.0")
           .Set("manifest_version", 2)
           .Set("export",
                DictionaryBuilder().Set("resources",
                                        ListBuilder().Append("foo.js"))).Build();
   scoped_refptr<Extension> shared_module_1 =
-      ExtensionBuilder().SetManifest(manifest_1.Pass())
-                        .AddFlags(Extension::FROM_WEBSTORE)
-                        .SetID(id_util::GenerateId("shared_module_1"))
-                        .Build();
+      ExtensionBuilder()
+          .SetManifest(manifest_1.Pass())
+          .AddFlags(Extension::FROM_WEBSTORE)
+          .SetID(crx_file::id_util::GenerateId("shared_module_1"))
+          .Build();
   EXPECT_TRUE(InstallExtension(shared_module_1, false));
 
   scoped_ptr<base::DictionaryValue> manifest_2 =
       DictionaryBuilder()
           .Set("name", "Shared Module 2")
           .Set("version", "1.0")
           .Set("manifest_version", 2)
           .Set("export",
                DictionaryBuilder().Set("resources",
                                        ListBuilder().Append("foo.js"))).Build();
   scoped_refptr<Extension> shared_module_2 =
-      ExtensionBuilder().SetManifest(manifest_2.Pass())
-                        .AddFlags(Extension::FROM_WEBSTORE)
-                        .SetID(id_util::GenerateId("shared_module_2"))
-                        .Build();
+      ExtensionBuilder()
+          .SetManifest(manifest_2.Pass())
+          .AddFlags(Extension::FROM_WEBSTORE)
+          .SetID(crx_file::id_util::GenerateId("shared_module_2"))
+          .Build();
   EXPECT_TRUE(InstallExtension(shared_module_2, false));
 
-  std::string extension_id = id_util::GenerateId("extension_id");
+  std::string extension_id = crx_file::id_util::GenerateId("extension_id");
 
   // Create and install an extension v1.0 that imports our new module 1.
   scoped_refptr<Extension> importing_extension_1 =
       CreateExtensionImportingModule(shared_module_1->id(),
                                      extension_id,
                                      "1.0");
   EXPECT_TRUE(InstallExtension(importing_extension_1, false));
 
   // Create and install a new version of the extension that imports our new
   // module 2.
@@ skipping 19 matching lines @@
   // Since the extension v1.2 does not depend any module, so the all models
   // should have been uninstalled.
   EXPECT_FALSE(registry()->GetExtensionById(shared_module_1->id(),
                                             ExtensionRegistry::EVERYTHING));
   EXPECT_FALSE(registry()->GetExtensionById(shared_module_2->id(),
                                             ExtensionRegistry::EVERYTHING));
 
 }
 
 TEST_F(SharedModuleServiceUnitTest, WhitelistedImports) {
-  std::string whitelisted_id = id_util::GenerateId("whitelisted");
-  std::string nonwhitelisted_id = id_util::GenerateId("nonwhitelisted");
+  std::string whitelisted_id = crx_file::id_util::GenerateId("whitelisted");
+  std::string nonwhitelisted_id =
+      crx_file::id_util::GenerateId("nonwhitelisted");
   // Create a module which exports to a restricted whitelist.
   scoped_ptr<base::DictionaryValue> manifest =
       DictionaryBuilder()
           .Set("name", "Shared Module")
           .Set("version", "1.0")
           .Set("manifest_version", 2)
           .Set("export",
                DictionaryBuilder().Set("whitelist",
                                        ListBuilder()
                                            .Append(whitelisted_id))
                                   .Set("resources",
                                        ListBuilder().Append("*"))).Build();
   scoped_refptr<Extension> shared_module =
-      ExtensionBuilder().SetManifest(manifest.Pass())
-                        .AddFlags(Extension::FROM_WEBSTORE)
-                        .SetID(id_util::GenerateId("shared_module"))
-                        .Build();
+      ExtensionBuilder()
+          .SetManifest(manifest.Pass())
+          .AddFlags(Extension::FROM_WEBSTORE)
+          .SetID(crx_file::id_util::GenerateId("shared_module"))
+          .Build();
 
   EXPECT_TRUE(InstallExtension(shared_module, false));
 
   // Create and install an extension with the whitelisted ID.
   scoped_refptr<Extension> whitelisted_extension =
       CreateExtensionImportingModule(shared_module->id(),
                                      whitelisted_id,
                                      "1.0");
   EXPECT_TRUE(InstallExtension(whitelisted_extension, false));
 
   // Try to install an extension with an ID that is not whitelisted.
   scoped_refptr<Extension> nonwhitelisted_extension =
       CreateExtensionImportingModule(shared_module->id(),
                                      nonwhitelisted_id,
                                      "1.0");
   EXPECT_FALSE(InstallExtension(nonwhitelisted_extension, false));
 }
 
 }  // namespace extensions