Rename ExtensionsService to ExtensionService.

chrome/browser/extensions/extension_management_browsertest.cc

 // Copyright (c) 2009 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/ref_counted.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/extensions_service.h"
+#include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/extensions/extension_updater.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/ui_test_utils.h"
@@ skipping 30 matching lines @@
     if (version_from_bg != expected_version ||
         extension->VersionString() != expected_version)
       return false;
     return true;
   }
 
   // Helper method that installs a low permission extension then updates
   // to the second version requiring increased permissions. Returns whether
   // the operation was completed successfully.
   bool InstallAndUpdateIncreasingPermissionsExtension() {
-    ExtensionsService* service = browser()->profile()->GetExtensionsService();
+    ExtensionService* service = browser()->profile()->GetExtensionService();
     size_t size_before = service->extensions()->size();
 
     // Install the initial version, which should happen just fine.
     if (!InstallExtension(
         test_data_dir_.AppendASCII("permissions-low-v1.crx"), 1))
       return false;
 
     // Upgrade to a version that wants more permissions. We should disable the
     // extension and prompt the user to reenable.
     if (service->extensions()->size() != size_before + 1)
       return false;
     if (!UpdateExtension(
         service->extensions()->at(size_before)->id(),
         test_data_dir_.AppendASCII("permissions-high-v2.crx"), -1))
       return false;
     EXPECT_EQ(size_before, service->extensions()->size());
     if (service->disabled_extensions()->size() != 1u)
       return false;
     return true;
   }
 };
 
 // Tests that installing the same version overwrites.
 IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, InstallSameVersion) {
-  ExtensionsService* service = browser()->profile()->GetExtensionsService();
+  ExtensionService* service = browser()->profile()->GetExtensionService();
   const size_t size_before = service->extensions()->size();
   ASSERT_TRUE(InstallExtension(
       test_data_dir_.AppendASCII("install/install.crx"), 1));
   FilePath old_path = service->extensions()->back()->path();
 
   // Install an extension with the same version. The previous install should be
   // overwritten.
   ASSERT_TRUE(InstallExtension(
       test_data_dir_.AppendASCII("install/install_same_version.crx"), 0));
   FilePath new_path = service->extensions()->back()->path();
 
   EXPECT_FALSE(IsExtensionAtVersion(service->extensions()->at(size_before),
                                     "1.0"));
   EXPECT_NE(old_path.value(), new_path.value());
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, InstallOlderVersion) {
-  ExtensionsService* service = browser()->profile()->GetExtensionsService();
+  ExtensionService* service = browser()->profile()->GetExtensionService();
   const size_t size_before = service->extensions()->size();
   ASSERT_TRUE(InstallExtension(
       test_data_dir_.AppendASCII("install/install.crx"), 1));
   ASSERT_TRUE(InstallExtension(
       test_data_dir_.AppendASCII("install/install_older_version.crx"), 0));
   EXPECT_TRUE(IsExtensionAtVersion(service->extensions()->at(size_before),
                                    "1.0"));
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, InstallThenCancel) {
-  ExtensionsService* service = browser()->profile()->GetExtensionsService();
+  ExtensionService* service = browser()->profile()->GetExtensionService();
   const size_t size_before = service->extensions()->size();
   ASSERT_TRUE(InstallExtension(
       test_data_dir_.AppendASCII("install/install.crx"), 1));
 
   // Cancel this install.
   StartInstallButCancel(test_data_dir_.AppendASCII("install/install_v2.crx"));
   EXPECT_TRUE(IsExtensionAtVersion(service->extensions()->at(size_before),
                                    "1.0"));
 }
 
 // Tests that installing and uninstalling extensions don't crash with an
 // incognito window open.
 IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, Incognito) {
   // Open an incognito window to the extensions management page.  We just
   // want to make sure that we don't crash while playing with extensions when
   // this guy is around.
   ui_test_utils::OpenURLOffTheRecord(browser()->profile(),
                                      GURL(chrome::kChromeUIExtensionsURL));
 
   ASSERT_TRUE(InstallExtension(test_data_dir_.AppendASCII("good.crx"), 1));
   UninstallExtension("ldnnhddmnhbkjipkidpdiheffobcpfmf");
 }
 
 // Tests the process of updating an extension to one that requires higher
 // permissions.
 IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, UpdatePermissions) {
-  ExtensionsService* service = browser()->profile()->GetExtensionsService();
+  ExtensionService* service = browser()->profile()->GetExtensionService();
   ASSERT_TRUE(InstallAndUpdateIncreasingPermissionsExtension());
   const size_t size_before = service->extensions()->size();
 
   // Now try reenabling it.
   service->EnableExtension(service->disabled_extensions()->at(0)->id());
   EXPECT_EQ(size_before + 1, service->extensions()->size());
   EXPECT_EQ(0u, service->disabled_extensions()->size());
 }
 
 // Tests that we can uninstall a disabled extension.
 IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, UninstallDisabled) {
-  ExtensionsService* service = browser()->profile()->GetExtensionsService();
+  ExtensionService* service = browser()->profile()->GetExtensionService();
   ASSERT_TRUE(InstallAndUpdateIncreasingPermissionsExtension());
   const size_t size_before = service->extensions()->size();
 
   // Now try uninstalling it.
   UninstallExtension(service->disabled_extensions()->at(0)->id());
   EXPECT_EQ(size_before, service->extensions()->size());
   EXPECT_EQ(0u, service->disabled_extensions()->size());
 }
 
 // Tests that disabling and re-enabling an extension works.
 IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, DisableEnable) {
   ExtensionProcessManager* manager = browser()->profile()->
       GetExtensionProcessManager();
-  ExtensionsService* service = browser()->profile()->GetExtensionsService();
+  ExtensionService* service = browser()->profile()->GetExtensionService();
   const size_t size_before = service->extensions()->size();
 
   // Load an extension, expect the background page to be available.
   ASSERT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("good").AppendASCII("Extensions")
                     .AppendASCII("bjafgdebaacbbbecmhlhpofkepfkgcpa")
                     .AppendASCII("1.0")));
   ASSERT_EQ(size_before + 1, service->extensions()->size());
   EXPECT_EQ(0u, service->disabled_extensions()->size());
   const Extension* extension = service->extensions()->at(size_before);
@@ skipping 22 matching lines @@
   scoped_refptr<AutoUpdateInterceptor> interceptor(new AutoUpdateInterceptor());
   URLFetcher::enable_interception_for_tests(true);
 
   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);
-  ExtensionsService* service = browser()->profile()->GetExtensionsService();
+  ExtensionService* service = browser()->profile()->GetExtensionService();
   const size_t size_before = service->extensions()->size();
   ASSERT_TRUE(service->disabled_extensions()->empty());
   ASSERT_TRUE(InstallExtension(basedir.AppendASCII("v1.crx"), 1));
   listener1.WaitUntilSatisfied();
   const ExtensionList* extensions = service->extensions();
   ASSERT_EQ(size_before + 1, extensions->size());
   ASSERT_TRUE(service->HasInstalledExtensions());
   ASSERT_EQ("ogjcoiohnmldgjemafoockdghcjciccf",
             extensions->at(size_before)->id());
   ASSERT_EQ("1.0", extensions->at(size_before)->VersionString());
@@ skipping 25 matching lines @@
   // Make sure the extension state is the same as before.
   extensions = service->extensions();
   ASSERT_EQ(size_before + 1, extensions->size());
   ASSERT_EQ("ogjcoiohnmldgjemafoockdghcjciccf",
             extensions->at(size_before)->id());
   ASSERT_EQ("2.0", extensions->at(size_before)->VersionString());
 }
 
 // See http://crbug.com/57378 for flakiness details.
 IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, ExternalUrlUpdate) {
-  ExtensionsService* service = browser()->profile()->GetExtensionsService();
+  ExtensionService* service = browser()->profile()->GetExtensionService();
   const char* kExtensionId = "ogjcoiohnmldgjemafoockdghcjciccf";
   // We don't want autoupdate blacklist checks.
   service->updater()->set_blacklist_checks_enabled(false);
 
   FilePath basedir = test_data_dir_.AppendASCII("autoupdate");
 
   // Note: This interceptor gets requests on the IO thread.
   scoped_refptr<AutoUpdateInterceptor> interceptor(new AutoUpdateInterceptor());
   URLFetcher::enable_interception_for_tests(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()->empty());
 
   // The code that reads external_extensions.json uses this method to inform
-  // the ExtensionsService of an extension to download.  Using the real code
+  // 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.
   service->AddPendingExtensionFromExternalUpdateUrl(
       kExtensionId, GURL("http://localhost/autoupdate/manifest"),
       Extension::EXTERNAL_PREF_DOWNLOAD);
 
   // Run autoupdate and make sure version 2 of the extension was installed.
   service->updater()->CheckNow();
   ASSERT_TRUE(WaitForExtensionInstall());
   const ExtensionList* extensions = service->extensions();
@@ skipping 31 matching lines @@
 
   // Uninstalling from a non-external source should not set the kill bit.
   UninstallExtension(kExtensionId);
 
   EXPECT_FALSE(extension_prefs->IsExtensionKilled(kExtensionId))
       << "Uninstalling non-external extension should not set kill bit.";
 }
 
 // See http://crbug.com/57378 for flakiness details.
 IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, ExternalPolicyRefresh) {
-  ExtensionsService* service = browser()->profile()->GetExtensionsService();
+  ExtensionService* service = browser()->profile()->GetExtensionService();
   const char* kExtensionId = "ogjcoiohnmldgjemafoockdghcjciccf";
   // We don't want autoupdate blacklist checks.
   service->updater()->set_blacklist_checks_enabled(false);
 
   FilePath basedir = test_data_dir_.AppendASCII("autoupdate");
 
   // Note: This interceptor gets requests on the IO thread.
   scoped_refptr<AutoUpdateInterceptor> interceptor(new AutoUpdateInterceptor());
   URLFetcher::enable_interception_for_tests(true);
 
@@ skipping 22 matching lines @@
   const ExtensionList* extensions = service->extensions();
   ASSERT_EQ(size_before + 1, extensions->size());
   ASSERT_EQ(kExtensionId, extensions->at(size_before)->id());
   EXPECT_EQ("2.0", extensions->at(size_before)->VersionString());
   EXPECT_EQ(Extension::EXTERNAL_POLICY_DOWNLOAD,
             extensions->at(size_before)->location());
 
   // Check that emptying the list doesn't cause any trouble.
   prefs->ClearPref(prefs::kExtensionInstallForceList);
 }