Rename ExtensionsService to ExtensionService.

chrome/browser/extensions/extension_crash_recovery_browsertest.cc

 // Copyright (c) 2010 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/process_util.h"
 #include "chrome/browser/extensions/crashed_extension_infobar.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
-#include "chrome/browser/extensions/extensions_service.h"
+#include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/result_codes.h"
 #include "chrome/test/ui_test_utils.h"
 
 class ExtensionCrashRecoveryTest : public ExtensionBrowserTest {
  protected:
-  ExtensionsService* GetExtensionsService() {
-    return browser()->profile()->GetExtensionsService();
+  ExtensionService* GetExtensionService() {
+    return browser()->profile()->GetExtensionService();
   }
 
   ExtensionProcessManager* GetExtensionProcessManager() {
     return browser()->profile()->GetExtensionProcessManager();
   }
 
   CrashedExtensionInfoBarDelegate* GetCrashedExtensionInfoBarDelegate(
       int index) {
     TabContents* current_tab = browser()->GetSelectedTabContents();
     EXPECT_LT(index, current_tab->infobar_delegate_count());
@@ skipping 10 matching lines @@
   }
 
   void CancelCrashedExtensionInfobar(int index) {
     CrashedExtensionInfoBarDelegate* infobar =
         GetCrashedExtensionInfoBarDelegate(index);
     ASSERT_TRUE(infobar);
     infobar->Cancel();
   }
 
   void CrashExtension(size_t index) {
-    ASSERT_LT(index, GetExtensionsService()->extensions()->size());
+    ASSERT_LT(index, GetExtensionService()->extensions()->size());
     const Extension* extension =
-        GetExtensionsService()->extensions()->at(index);
+        GetExtensionService()->extensions()->at(index);
     ASSERT_TRUE(extension);
     std::string extension_id(extension->id());
     ExtensionHost* extension_host =
         GetExtensionProcessManager()->GetBackgroundHostForExtension(extension);
     ASSERT_TRUE(extension_host);
 
     RenderProcessHost* extension_rph =
         extension_host->render_view_host()->process();
     base::KillProcess(extension_rph->GetHandle(), ResultCodes::KILLED, false);
     ASSERT_TRUE(WaitForExtensionCrash(extension_id));
     ASSERT_FALSE(
         GetExtensionProcessManager()->GetBackgroundHostForExtension(extension));
   }
 
   void CheckExtensionConsistency(size_t index) {
-    ASSERT_LT(index, GetExtensionsService()->extensions()->size());
+    ASSERT_LT(index, GetExtensionService()->extensions()->size());
     const Extension* extension =
-        GetExtensionsService()->extensions()->at(index);
+        GetExtensionService()->extensions()->at(index);
     ASSERT_TRUE(extension);
     ExtensionHost* extension_host =
         GetExtensionProcessManager()->GetBackgroundHostForExtension(extension);
     ASSERT_TRUE(extension_host);
     ASSERT_TRUE(GetExtensionProcessManager()->HasExtensionHost(extension_host));
     ASSERT_TRUE(extension_host->IsRenderViewLive());
     ASSERT_EQ(extension_host->render_view_host()->process(),
         GetExtensionProcessManager()->GetExtensionProcess(extension->id()));
   }
 
   void LoadTestExtension() {
     ExtensionBrowserTest::SetUpInProcessBrowserTestFixture();
-    const size_t size_before = GetExtensionsService()->extensions()->size();
+    const size_t size_before = GetExtensionService()->extensions()->size();
     ASSERT_TRUE(LoadExtension(
         test_data_dir_.AppendASCII("common").AppendASCII("background_page")));
-    const Extension* extension = GetExtensionsService()->extensions()->back();
+    const Extension* extension = GetExtensionService()->extensions()->back();
     ASSERT_TRUE(extension);
     first_extension_id_ = extension->id();
     CheckExtensionConsistency(size_before);
   }
 
   void LoadSecondExtension() {
-    int offset = GetExtensionsService()->extensions()->size();
+    int offset = GetExtensionService()->extensions()->size();
     ASSERT_TRUE(LoadExtension(
         test_data_dir_.AppendASCII("install").AppendASCII("install")));
     const Extension* extension =
-        GetExtensionsService()->extensions()->at(offset);
+        GetExtensionService()->extensions()->at(offset);
     ASSERT_TRUE(extension);
     second_extension_id_ = extension->id();
     CheckExtensionConsistency(offset);
   }
 
   std::string first_extension_id_;
   std::string second_extension_id_;
 };
 
 IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, Basic) {
-  const size_t size_before = GetExtensionsService()->extensions()->size();
+  const size_t size_before = GetExtensionService()->extensions()->size();
   LoadTestExtension();
   CrashExtension(size_before);
-  ASSERT_EQ(size_before, GetExtensionsService()->extensions()->size());
+  ASSERT_EQ(size_before, GetExtensionService()->extensions()->size());
   AcceptCrashedExtensionInfobar(0);
 
   SCOPED_TRACE("after clicking the infobar");
   CheckExtensionConsistency(size_before);
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, CloseAndReload) {
-  const size_t size_before = GetExtensionsService()->extensions()->size();
+  const size_t size_before = GetExtensionService()->extensions()->size();
   LoadTestExtension();
   CrashExtension(size_before);
-  ASSERT_EQ(size_before, GetExtensionsService()->extensions()->size());
+  ASSERT_EQ(size_before, GetExtensionService()->extensions()->size());
   CancelCrashedExtensionInfobar(0);
   ReloadExtension(first_extension_id_);
 
   SCOPED_TRACE("after reloading");
   CheckExtensionConsistency(size_before);
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, ReloadIndependently) {
-  const size_t size_before = GetExtensionsService()->extensions()->size();
+  const size_t size_before = GetExtensionService()->extensions()->size();
   LoadTestExtension();
   CrashExtension(size_before);
-  ASSERT_EQ(size_before, GetExtensionsService()->extensions()->size());
+  ASSERT_EQ(size_before, GetExtensionService()->extensions()->size());
 
   ReloadExtension(first_extension_id_);
 
   SCOPED_TRACE("after reloading");
   CheckExtensionConsistency(size_before);
 
   TabContents* current_tab = browser()->GetSelectedTabContents();
   ASSERT_TRUE(current_tab);
 
   // The infobar should automatically hide after the extension is successfully
   // reloaded.
   ASSERT_EQ(0, current_tab->infobar_delegate_count());
 }
 
 // Make sure that when we don't do anything about the crashed extension
 // and close the browser, it doesn't crash. The browser is closed implicitly
 // at the end of each browser test.
 IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, ShutdownWhileCrashed) {
-  const size_t size_before = GetExtensionsService()->extensions()->size();
+  const size_t size_before = GetExtensionService()->extensions()->size();
   LoadTestExtension();
   CrashExtension(size_before);
-  ASSERT_EQ(size_before, GetExtensionsService()->extensions()->size());
+  ASSERT_EQ(size_before, GetExtensionService()->extensions()->size());
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, TwoExtensionsCrashFirst) {
-  const size_t size_before = GetExtensionsService()->extensions()->size();
+  const size_t size_before = GetExtensionService()->extensions()->size();
   LoadTestExtension();
   LoadSecondExtension();
   CrashExtension(size_before);
-  ASSERT_EQ(size_before + 1, GetExtensionsService()->extensions()->size());
+  ASSERT_EQ(size_before + 1, GetExtensionService()->extensions()->size());
   AcceptCrashedExtensionInfobar(0);
 
   SCOPED_TRACE("after clicking the infobar");
   CheckExtensionConsistency(size_before);
   CheckExtensionConsistency(size_before + 1);
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, TwoExtensionsCrashSecond) {
-  const size_t size_before = GetExtensionsService()->extensions()->size();
+  const size_t size_before = GetExtensionService()->extensions()->size();
   LoadTestExtension();
   LoadSecondExtension();
   CrashExtension(size_before + 1);
-  ASSERT_EQ(size_before + 1, GetExtensionsService()->extensions()->size());
+  ASSERT_EQ(size_before + 1, GetExtensionService()->extensions()->size());
   AcceptCrashedExtensionInfobar(0);
 
   SCOPED_TRACE("after clicking the infobar");
   CheckExtensionConsistency(size_before);
   CheckExtensionConsistency(size_before + 1);
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest,
                        TwoExtensionsCrashBothAtOnce) {
-  const size_t size_before = GetExtensionsService()->extensions()->size();
+  const size_t size_before = GetExtensionService()->extensions()->size();
   LoadTestExtension();
   LoadSecondExtension();
   CrashExtension(size_before);
-  ASSERT_EQ(size_before + 1, GetExtensionsService()->extensions()->size());
+  ASSERT_EQ(size_before + 1, GetExtensionService()->extensions()->size());
   CrashExtension(size_before);
-  ASSERT_EQ(size_before, GetExtensionsService()->extensions()->size());
+  ASSERT_EQ(size_before, GetExtensionService()->extensions()->size());
 
   {
     SCOPED_TRACE("first infobar");
     AcceptCrashedExtensionInfobar(0);
     CheckExtensionConsistency(size_before);
   }
 
   {
     SCOPED_TRACE("second infobar");
     AcceptCrashedExtensionInfobar(0);
     CheckExtensionConsistency(size_before);
     CheckExtensionConsistency(size_before + 1);
   }
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, TwoExtensionsOneByOne) {
-  const size_t size_before = GetExtensionsService()->extensions()->size();
+  const size_t size_before = GetExtensionService()->extensions()->size();
   LoadTestExtension();
   CrashExtension(size_before);
-  ASSERT_EQ(size_before, GetExtensionsService()->extensions()->size());
+  ASSERT_EQ(size_before, GetExtensionService()->extensions()->size());
   LoadSecondExtension();
   CrashExtension(size_before);
-  ASSERT_EQ(size_before, GetExtensionsService()->extensions()->size());
+  ASSERT_EQ(size_before, GetExtensionService()->extensions()->size());
 
   {
     SCOPED_TRACE("first infobar");
     AcceptCrashedExtensionInfobar(0);
     CheckExtensionConsistency(size_before);
   }
 
   {
     SCOPED_TRACE("second infobar");
     AcceptCrashedExtensionInfobar(0);
     CheckExtensionConsistency(size_before);
     CheckExtensionConsistency(size_before + 1);
   }
 }
 
 // Make sure that when we don't do anything about the crashed extensions
 // and close the browser, it doesn't crash. The browser is closed implicitly
 // at the end of each browser test.
 IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest,
                        TwoExtensionsShutdownWhileCrashed) {
-  const size_t size_before = GetExtensionsService()->extensions()->size();
+  const size_t size_before = GetExtensionService()->extensions()->size();
   LoadTestExtension();
   CrashExtension(size_before);
-  ASSERT_EQ(size_before, GetExtensionsService()->extensions()->size());
+  ASSERT_EQ(size_before, GetExtensionService()->extensions()->size());
   LoadSecondExtension();
   CrashExtension(size_before);
-  ASSERT_EQ(size_before, GetExtensionsService()->extensions()->size());
+  ASSERT_EQ(size_before, GetExtensionService()->extensions()->size());
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest,
                        TwoExtensionsIgnoreFirst) {
-  const size_t size_before = GetExtensionsService()->extensions()->size();
+  const size_t size_before = GetExtensionService()->extensions()->size();
   LoadTestExtension();
   LoadSecondExtension();
   CrashExtension(size_before);
-  ASSERT_EQ(size_before + 1, GetExtensionsService()->extensions()->size());
+  ASSERT_EQ(size_before + 1, GetExtensionService()->extensions()->size());
   CrashExtension(size_before);
-  ASSERT_EQ(size_before, GetExtensionsService()->extensions()->size());
+  ASSERT_EQ(size_before, GetExtensionService()->extensions()->size());
 
   CancelCrashedExtensionInfobar(0);
   AcceptCrashedExtensionInfobar(1);
 
   SCOPED_TRACE("infobars done");
-  ASSERT_EQ(size_before + 1, GetExtensionsService()->extensions()->size());
+  ASSERT_EQ(size_before + 1, GetExtensionService()->extensions()->size());
   CheckExtensionConsistency(size_before);
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest,
                        TwoExtensionsReloadIndependently) {
-  const size_t size_before = GetExtensionsService()->extensions()->size();
+  const size_t size_before = GetExtensionService()->extensions()->size();
   LoadTestExtension();
   LoadSecondExtension();
   CrashExtension(size_before);
-  ASSERT_EQ(size_before + 1, GetExtensionsService()->extensions()->size());
+  ASSERT_EQ(size_before + 1, GetExtensionService()->extensions()->size());
   CrashExtension(size_before);
-  ASSERT_EQ(size_before, GetExtensionsService()->extensions()->size());
+  ASSERT_EQ(size_before, GetExtensionService()->extensions()->size());
 
   {
     SCOPED_TRACE("first: reload");
     TabContents* current_tab = browser()->GetSelectedTabContents();
     ASSERT_TRUE(current_tab);
     // At the beginning we should have one infobar displayed for each extension.
     ASSERT_EQ(2, current_tab->infobar_delegate_count());
     ReloadExtension(first_extension_id_);
     // One of the infobars should hide after the extension is reloaded.
     ASSERT_EQ(1, current_tab->infobar_delegate_count());
     CheckExtensionConsistency(size_before);
   }
 
   {
     SCOPED_TRACE("second: infobar");
     AcceptCrashedExtensionInfobar(0);
     CheckExtensionConsistency(size_before);
     CheckExtensionConsistency(size_before + 1);
   }
 }