Revert 113071 - Revert 113047 - Make ExtensionService use ExtensionSet.

chrome/browser/intents/web_intents_registry_unittest.cc

 // Copyright (c) 2011 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/file_util.h"
 #include "base/json/json_value_serializer.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/test_extension_service.h"
 #include "chrome/browser/intents/web_intents_registry.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/common/chrome_paths.h"
+#include "chrome/common/extensions/extension_set.h"
 #include "content/test/test_browser_thread.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::BrowserThread;
 using webkit_glue::WebIntentServiceData;
 
 class MockExtensionService: public TestExtensionService {
  public:
   virtual ~MockExtensionService() {}
-  MOCK_CONST_METHOD0(extensions, const ExtensionList*());
+  MOCK_CONST_METHOD0(extensions, const ExtensionSet*());
 };
 
-// TODO(groby): Unify loading functions with extension_manifest_unittest code.
-DictionaryValue* LoadManifestFile(const std::string& filename,
-                                  std::string* error) {
-  FilePath path;
-  PathService::Get(chrome::DIR_TEST_DATA, &path);
-  path = path.AppendASCII("extensions")
-      .AppendASCII("manifest_tests")
-      .AppendASCII(filename.c_str());
-  EXPECT_TRUE(file_util::PathExists(path));
-
-  JSONFileValueSerializer serializer(path);
-  return static_cast<DictionaryValue*>(serializer.Deserialize(NULL, error));
-}
-
 namespace {
 
-scoped_refptr<Extension> LoadExtensionWithLocation(
-    DictionaryValue* value,
-    Extension::Location location,
-    bool strict_error_checks,
-    std::string* error) {
-  FilePath path;
-  PathService::Get(chrome::DIR_TEST_DATA, &path);
-  path = path.AppendASCII("extensions").AppendASCII("manifest_tests");
-  int flags = Extension::NO_FLAGS;
-  if (strict_error_checks)
-    flags |= Extension::STRICT_ERROR_CHECKS;
-  return Extension::Create(path.DirName(), location, *value, flags, error);
+// TODO(groby): Unify loading functions with extension_manifest_unittest code.
+DictionaryValue* LoadManifestFile(const FilePath& path,
+                                  std::string* error) {
+  EXPECT_TRUE(file_util::PathExists(path));
+  JSONFileValueSerializer serializer(path);
+  return static_cast<DictionaryValue*>(serializer.Deserialize(NULL, error));
 }
 
 scoped_refptr<Extension> LoadExtensionWithLocation(
     const std::string& name,
     Extension::Location location,
     bool strict_error_checks,
     std::string* error) {
-  scoped_ptr<DictionaryValue> value(LoadManifestFile(name, error));
+  FilePath path;
+  PathService::Get(chrome::DIR_TEST_DATA, &path);
+  path = path.AppendASCII("extensions")
+      .AppendASCII("manifest_tests")
+      .AppendASCII(name.c_str());
+  scoped_ptr<DictionaryValue> value(LoadManifestFile(path, error));
   if (!value.get())
     return NULL;
-  return LoadExtensionWithLocation(value.get(), location,
-                                   strict_error_checks, error);
+  int flags = Extension::NO_FLAGS;
+  if (strict_error_checks)
+    flags |= Extension::STRICT_ERROR_CHECKS;
+  return Extension::CreateWithId(path.DirName(),
+                                 location,
+                                 *value,
+                                 flags,
+                                 Extension::GenerateIdForPath(path),
+                                 error);
 }
 
 scoped_refptr<Extension> LoadExtension(const std::string& name,
                                        std::string* error) {
   return LoadExtensionWithLocation(name, Extension::INTERNAL, false, error);
 }
 
 scoped_refptr<Extension> LoadAndExpectSuccess(const std::string& name) {
   std::string error;
   scoped_refptr<Extension> extension = LoadExtension(name, &error);
@@ skipping 30 matching lines @@
     db_thread_.Stop();
     MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask);
     MessageLoop::current()->Run();
   }
 
   MessageLoopForUI message_loop_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread db_thread_;
   scoped_refptr<WebDataService> wds_;
   MockExtensionService extension_service_;
-  ExtensionList extensions_;
+  ExtensionSet extensions_;
   WebIntentsRegistry registry_;
   ScopedTempDir temp_dir_;
 };
 
 // Simple consumer for WebIntentsRegistry notifications. Stores result data and
 // terminates UI thread when callback is invoked.
 class TestConsumer: public WebIntentsRegistry::Consumer {
  public:
    virtual void OnIntentsQueryDone(
        WebIntentsRegistry::QueryID id,
@@ skipping 78 matching lines @@
     std::swap(consumer.services_[0],consumer.services_[1]);
 
   service.action = ASCIIToUTF16("share");
   EXPECT_EQ(service, consumer.services_[0]);
 
   service.action = ASCIIToUTF16("search");
   EXPECT_EQ(service, consumer.services_[1]);
 }
 
 TEST_F(WebIntentsRegistryTest, GetExtensionIntents) {
-  extensions_.push_back(LoadAndExpectSuccess("intent_valid.json"));
-  extensions_.push_back(LoadAndExpectSuccess("intent_valid_2.json"));
+  extensions_.Insert(LoadAndExpectSuccess("intent_valid.json"));
+  extensions_.Insert(LoadAndExpectSuccess("intent_valid_2.json"));
+  ASSERT_EQ(2U, extensions_.size());
 
   TestConsumer consumer;
   consumer.expected_id_ = registry_.GetAllIntentProviders(&consumer);
   consumer.WaitForData();
   ASSERT_EQ(2U, consumer.services_.size());
 }
 
 TEST_F(WebIntentsRegistryTest, GetSomeExtensionIntents) {
-  extensions_.push_back(LoadAndExpectSuccess("intent_valid.json"));
-  extensions_.push_back(LoadAndExpectSuccess("intent_valid_2.json"));
+  extensions_.Insert(LoadAndExpectSuccess("intent_valid.json"));
+  extensions_.Insert(LoadAndExpectSuccess("intent_valid_2.json"));
+  ASSERT_EQ(2U, extensions_.size());
 
   TestConsumer consumer;
   consumer.expected_id_ = registry_.GetIntentProviders(
       ASCIIToUTF16("http://webintents.org/edit"), ASCIIToUTF16("*"),
       &consumer);
   consumer.WaitForData();
   ASSERT_EQ(1U, consumer.services_.size());
 }
 
 TEST_F(WebIntentsRegistryTest, GetIntentsFromMixedSources) {
-  extensions_.push_back(LoadAndExpectSuccess("intent_valid.json"));
-  extensions_.push_back(LoadAndExpectSuccess("intent_valid_2.json"));
+  extensions_.Insert(LoadAndExpectSuccess("intent_valid.json"));
+  extensions_.Insert(LoadAndExpectSuccess("intent_valid_2.json"));
+  ASSERT_EQ(2U, extensions_.size());
 
   webkit_glue::WebIntentServiceData service;
   service.service_url = GURL("http://somewhere.com/intent/edit.html");
   service.action = ASCIIToUTF16("http://webintents.org/edit");
   service.type = ASCIIToUTF16("image/*");
   service.title = ASCIIToUTF16("Image Editing Service");
   registry_.RegisterIntentProvider(service);
 
   TestConsumer consumer;
   consumer.expected_id_ = registry_.GetIntentProviders(
@@ skipping 73 matching lines @@
   consumer.expected_id_ = registry_.GetIntentProviders(
       ASCIIToUTF16("http://webintents.org/share"),
       ASCIIToUTF16("*"), &consumer);
   consumer.WaitForData();
   ASSERT_EQ(4U, consumer.services_.size());
   EXPECT_EQ(services[0], consumer.services_[0]);
   EXPECT_EQ(services[1], consumer.services_[1]);
   EXPECT_EQ(services[2], consumer.services_[2]);
   EXPECT_EQ(services[3], consumer.services_[3]);
 }