Revert 113047 - Make ExtensionService use ExtensionSet.

chrome/browser/extensions/extension_management_browsertest.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/memory/ref_counted.h"
 #include "base/stl_util.h"
 #include "chrome/browser/extensions/autoupdate_interceptor.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ skipping 296 matching lines @@
 
   interceptor->SetResponseOnIOThread("http://localhost/autoupdate/manifest",
                                      basedir.AppendASCII("manifest_v2.xml"));
   interceptor->SetResponseOnIOThread("http://localhost/autoupdate/v2.crx",
                                      basedir.AppendASCII("v2.crx"));
 
   // Install version 1 of the extension.
   ExtensionTestMessageListener listener1("v1 installed", false);
   ExtensionService* service = browser()->profile()->GetExtensionService();
   const size_t size_before = service->extensions()->size();
-  ASSERT_TRUE(service->disabled_extensions()->is_empty());
+  ASSERT_TRUE(service->disabled_extensions()->empty());
   const Extension* extension =
       InstallExtension(basedir.AppendASCII("v1.crx"), 1);
   ASSERT_TRUE(extension);
   listener1.WaitUntilSatisfied();
   ASSERT_EQ(size_before + 1, service->extensions()->size());
   ASSERT_EQ("ogjcoiohnmldgjemafoockdghcjciccf", extension->id());
   ASSERT_EQ("1.0", extension->VersionString());
 
   // We don't want autoupdate blacklist checks.
   service->updater()->set_blacklist_checks_enabled(false);
@@ skipping 47 matching lines @@
   // Note: This interceptor gets requests on the IO thread.
   scoped_refptr<AutoUpdateInterceptor> interceptor(new AutoUpdateInterceptor());
   content::URLFetcher::SetEnableInterceptionForTests(true);
 
   interceptor->SetResponseOnIOThread("http://localhost/autoupdate/manifest",
                                      basedir.AppendASCII("manifest_v2.xml"));
   interceptor->SetResponseOnIOThread("http://localhost/autoupdate/v2.crx",
                                      basedir.AppendASCII("v2.crx"));
 
   const size_t size_before = service->extensions()->size();
-  ASSERT_TRUE(service->disabled_extensions()->is_empty());
+  ASSERT_TRUE(service->disabled_extensions()->empty());
 
   PendingExtensionManager* pending_extension_manager =
       service->pending_extension_manager();
 
   // The code that reads external_extensions.json uses this method to inform
   // the ExtensionService of an extension to download.  Using the real code
   // is race-prone, because instantating the ExtensionService starts a read
   // of external_extensions.json before this test function starts.
 
   pending_extension_manager->AddFromExternalUpdateUrl(
@@ skipping 62 matching lines @@
   // Note: This interceptor gets requests on the IO thread.
   scoped_refptr<AutoUpdateInterceptor> interceptor(new AutoUpdateInterceptor());
   content::URLFetcher::SetEnableInterceptionForTests(true);
 
   interceptor->SetResponseOnIOThread("http://localhost/autoupdate/manifest",
                                      basedir.AppendASCII("manifest_v2.xml"));
   interceptor->SetResponseOnIOThread("http://localhost/autoupdate/v2.crx",
                                      basedir.AppendASCII("v2.crx"));
 
   const size_t size_before = service->extensions()->size();
-  ASSERT_TRUE(service->disabled_extensions()->is_empty());
+  ASSERT_TRUE(service->disabled_extensions()->empty());
 
   PrefService* prefs = browser()->profile()->GetPrefs();
   const ListValue* forcelist =
       prefs->GetList(prefs::kExtensionInstallForceList);
   ASSERT_TRUE(forcelist->empty()) << kForceInstallNotEmptyHelp;
 
   {
     // Set the policy as a user preference and fire notification observers.
     ListPrefUpdate pref_update(prefs, prefs::kExtensionInstallForceList);
     ListValue* forcelist = pref_update.Get();
@@ skipping 34 matching lines @@
   EXPECT_EQ(size_before + 1, service->extensions()->size());
   EXPECT_FALSE(service->GetExtensionById(kExtensionId, true));
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, PolicyOverridesUserInstall) {
   ExtensionService* service = browser()->profile()->GetExtensionService();
   const char* kExtensionId = "ogjcoiohnmldgjemafoockdghcjciccf";
   service->updater()->set_blacklist_checks_enabled(false);
   const size_t size_before = service->extensions()->size();
   FilePath basedir = test_data_dir_.AppendASCII("autoupdate");
-  ASSERT_TRUE(service->disabled_extensions()->is_empty());
+  ASSERT_TRUE(service->disabled_extensions()->empty());
 
   // Note: This interceptor gets requests on the IO thread.
   scoped_refptr<AutoUpdateInterceptor> interceptor(new AutoUpdateInterceptor());
   content::URLFetcher::SetEnableInterceptionForTests(true);
 
   interceptor->SetResponseOnIOThread("http://localhost/autoupdate/manifest",
                                      basedir.AppendASCII("manifest_v2.xml"));
   interceptor->SetResponseOnIOThread("http://localhost/autoupdate/v2.crx",
                                      basedir.AppendASCII("v2.crx"));
 
@@ skipping 40 matching lines @@
   extension = service->GetExtensionById(kExtensionId, true);
   EXPECT_FALSE(extension);
 
   // User install again, but have it disabled too before setting the policy.
   ASSERT_TRUE(InstallExtension(basedir.AppendASCII("v2.crx"), 1));
   ASSERT_EQ(size_before + 1, service->extensions()->size());
   extension = service->GetExtensionById(kExtensionId, false);
   ASSERT_TRUE(extension);
   EXPECT_EQ(Extension::INTERNAL, extension->location());
   EXPECT_TRUE(service->IsExtensionEnabled(kExtensionId));
-  EXPECT_TRUE(service->disabled_extensions()->is_empty());
+  EXPECT_TRUE(service->disabled_extensions()->empty());
 
   service->DisableExtension(kExtensionId);
   EXPECT_EQ(1u, service->disabled_extensions()->size());
   extension = service->GetExtensionById(kExtensionId, true);
   EXPECT_TRUE(extension);
   EXPECT_FALSE(service->IsExtensionEnabled(kExtensionId));
 
   // Install the policy again. It should overwrite the extension's location,
   // and force enable it too.
   {
     ListPrefUpdate pref_update(prefs, prefs::kExtensionInstallForceList);
     ListValue* forcelist = pref_update.Get();
     ASSERT_TRUE(forcelist->empty());
     forcelist->Append(Value::CreateStringValue(
         std::string(kExtensionId) + ";http://localhost/autoupdate/manifest"));
   }
   ASSERT_TRUE(WaitForExtensionInstall());
   ASSERT_EQ(size_before + 1, service->extensions()->size());
   extension = service->GetExtensionById(kExtensionId, false);
   ASSERT_TRUE(extension);
   EXPECT_EQ(Extension::EXTERNAL_POLICY_DOWNLOAD, extension->location());
   EXPECT_TRUE(service->IsExtensionEnabled(kExtensionId));
-  EXPECT_TRUE(service->disabled_extensions()->is_empty());
+  EXPECT_TRUE(service->disabled_extensions()->empty());
 }