Extensions: Move id_util functions to crx_file component.

chrome/common/pepper_permission_util_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 "chrome/common/pepper_permission_util.h"
 
 #include <set>
 #include <string>
 
 #include "chrome/common/extensions/features/feature_channel.h"
+#include "components/crx_file/id_util.h"
 #include "extensions/common/extension_builder.h"
 #include "extensions/common/extension_set.h"
-#include "extensions/common/id_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using chrome::IsExtensionOrSharedModuleWhitelisted;
 
 namespace extensions {
 
 namespace {
 
 // Return an extension with |id| which imports a module with the given
 // |import_id|.
@@ skipping 14 matching lines @@
       .AddFlags(Extension::FROM_WEBSTORE)
       .SetID(id)
       .Build();
 }
 
 }  // namespace
 
 TEST(PepperPermissionUtilTest, ExtensionWhitelisting) {
   ScopedCurrentChannel current_channel(chrome::VersionInfo::CHANNEL_UNKNOWN);
   ExtensionSet extensions;
-  std::string whitelisted_id = id_util::GenerateId("whitelisted_extension");
+  std::string whitelisted_id =
+      crx_file::id_util::GenerateId("whitelisted_extension");
   scoped_ptr<base::DictionaryValue> manifest =
       DictionaryBuilder()
           .Set("name", "Whitelisted Extension")
           .Set("version", "1.0")
           .Set("manifest_version", 2)
           .Build();
   scoped_refptr<Extension> ext = ExtensionBuilder()
                                      .SetManifest(manifest.Pass())
                                      .SetID(whitelisted_id)
                                      .Build();
   extensions.Insert(ext);
   std::set<std::string> whitelist;
   std::string url = std::string("chrome-extension://") + whitelisted_id +
                     std::string("/manifest.nmf");
   std::string bad_scheme_url =
       std::string("http://") + whitelisted_id + std::string("/manifest.nmf");
-  std::string bad_host_url =
-      std::string("chrome-extension://") + id_util::GenerateId("bad_host");
+  std::string bad_host_url = std::string("chrome-extension://") +
+                             crx_file::id_util::GenerateId("bad_host");
   std::string("/manifest.nmf");
 
   EXPECT_FALSE(
       IsExtensionOrSharedModuleWhitelisted(GURL(url), &extensions, whitelist));
   whitelist.insert(whitelisted_id);
   EXPECT_TRUE(
       IsExtensionOrSharedModuleWhitelisted(GURL(url), &extensions, whitelist));
   EXPECT_FALSE(IsExtensionOrSharedModuleWhitelisted(
       GURL(bad_scheme_url), &extensions, whitelist));
   EXPECT_FALSE(IsExtensionOrSharedModuleWhitelisted(
       GURL(bad_host_url), &extensions, whitelist));
 }
 
 TEST(PepperPermissionUtilTest, SharedModuleWhitelisting) {
   ScopedCurrentChannel current_channel(chrome::VersionInfo::CHANNEL_UNKNOWN);
   ExtensionSet extensions;
-  std::string whitelisted_id = id_util::GenerateId("extension_id");
-  std::string bad_id = id_util::GenerateId("bad_id");
+  std::string whitelisted_id = crx_file::id_util::GenerateId("extension_id");
+  std::string bad_id = crx_file::id_util::GenerateId("bad_id");
 
   scoped_ptr<base::DictionaryValue> shared_module_manifest =
       DictionaryBuilder()
           .Set("name", "Whitelisted Shared Module")
           .Set("version", "1.0")
           .Set("manifest_version", 2)
           .Set("export",
                DictionaryBuilder()
                    .Set("resources", ListBuilder().Append("*"))
                    // Add the extension to the whitelist.  This
@@ skipping 30 matching lines @@
       GURL(bad_extension_url), &extensions, whitelist));
 
   // Note that the whitelist should be empty after this call, so tests checking
   // for failure to import will fail because of this.
   whitelist.erase(shared_module->id());
   EXPECT_FALSE(IsExtensionOrSharedModuleWhitelisted(
       GURL(extension_url), &extensions, whitelist));
 }
 
 }  // namespace extensions