Revert 113047 - Make ExtensionService use ExtensionSet.

chrome/browser/background/background_application_list_model_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.
 
 // TODO(rickcam): Bug 73183: Add unit tests for image loading
 
 #include <cstdlib>
 #include <set>
 
 #include "chrome/browser/background/background_application_list_model.h"
@@ skipping 42 matching lines @@
   DictionaryValue manifest;
   manifest.SetString(extension_manifest_keys::kVersion, "1.0.0.0");
   manifest.SetString(extension_manifest_keys::kName, name);
   if (background_permission) {
     ListValue* permissions = new ListValue();
     manifest.Set(extension_manifest_keys::kPermissions, permissions);
     permissions->Append(Value::CreateStringValue("background"));
   }
   std::string error;
   scoped_refptr<Extension> extension = Extension::Create(
-      bogus_file_path().AppendASCII(name),
-      Extension::INVALID,
-      manifest,
-      Extension::STRICT_ERROR_CHECKS,
-      &error);
+      bogus_file_path().AppendASCII(name), Extension::INVALID, manifest,
+      Extension::STRICT_ERROR_CHECKS, &error);
   // Cannot ASSERT_* here because that attempts an illegitimate return.
   // Cannot EXPECT_NE here because that assumes non-pointers unlike EXPECT_EQ
   EXPECT_TRUE(extension.get() != NULL) << error;
   return extension;
 }
 
 namespace {
 std::string GenerateUniqueExtensionName() {
   static int uniqueness = 0;
   std::ostringstream output;
@@ skipping 23 matching lines @@
 }  // namespace
 
 // With minimal test logic, verifies behavior over an explicit set of
 // extensions, of which some are Background Apps and others are not.
 TEST_F(BackgroundApplicationListModelTest, ExplicitTest) {
   InitializeAndLoadEmptyExtensionService();
   ExtensionService* service = profile_->GetExtensionService();
   ASSERT_TRUE(service);
   ASSERT_TRUE(service->is_ready());
   ASSERT_TRUE(service->extensions());
-  ASSERT_TRUE(service->extensions()->is_empty());
+  ASSERT_TRUE(service->extensions()->empty());
   scoped_ptr<BackgroundApplicationListModel> model(
       new BackgroundApplicationListModel(profile_.get()));
   ASSERT_EQ(0U, model->size());
 
   scoped_refptr<Extension> ext1 = CreateExtension("alpha", false);
   scoped_refptr<Extension> ext2 = CreateExtension("bravo", false);
   scoped_refptr<Extension> ext3 = CreateExtension("charlie", false);
   scoped_refptr<Extension> bgapp1 = CreateExtension("delta", true);
   scoped_refptr<Extension> bgapp2 = CreateExtension("echo", true);
   ASSERT_TRUE(service->extensions() != NULL);
@@ skipping 45 matching lines @@
   ASSERT_EQ(0U, model->size());
 }
 
 // With minimal test logic, verifies behavior with dynamic permissions.
 TEST_F(BackgroundApplicationListModelTest, AddRemovePermissionsTest) {
   InitializeAndLoadEmptyExtensionService();
   ExtensionService* service = profile_->GetExtensionService();
   ASSERT_TRUE(service);
   ASSERT_TRUE(service->is_ready());
   ASSERT_TRUE(service->extensions());
-  ASSERT_TRUE(service->extensions()->is_empty());
+  ASSERT_TRUE(service->extensions()->empty());
   scoped_ptr<BackgroundApplicationListModel> model(
       new BackgroundApplicationListModel(profile_.get()));
   ASSERT_EQ(0U, model->size());
 
   scoped_refptr<Extension> ext = CreateExtension("extension", false);
   scoped_refptr<Extension> bgapp = CreateExtension("application", true);
   ASSERT_TRUE(service->extensions() != NULL);
   ASSERT_EQ(0U, service->extensions()->size());
   ASSERT_EQ(0U, model->size());
 
@@ skipping 118 matching lines @@
 }  // namespace
 
 // Verifies behavior with a pseudo-randomly generated set of actions: Adding and
 // removing extensions, of which some are Background Apps and others are not.
 TEST_F(BackgroundApplicationListModelTest, RandomTest) {
   InitializeAndLoadEmptyExtensionService();
   ExtensionService* service = profile_->GetExtensionService();
   ASSERT_TRUE(service);
   ASSERT_TRUE(service->is_ready());
   ASSERT_TRUE(service->extensions());
-  ASSERT_TRUE(service->extensions()->is_empty());
+  ASSERT_TRUE(service->extensions()->empty());
   scoped_ptr<BackgroundApplicationListModel> model(
       new BackgroundApplicationListModel(profile_.get()));
   ASSERT_EQ(0U, model->size());
 
   static const int kIterations = 500;
   ExtensionCollection extensions;
   size_t count = 0;
   size_t expected = 0;
   srand(RANDOM_SEED);
   for (int index = 0; index < kIterations; ++index) {
     switch (rand() % 3) {
       case 0:
         AddExtension(service, &extensions, model.get(), &expected, &count);
         break;
       case 1:
         RemoveExtension(service, &extensions, model.get(), &expected, &count);
         break;
       case 2:
         TogglePermission(service, &extensions, model.get(), &expected, &count);
         break;
       default:
         NOTREACHED();
         break;
     }
   }
 }