Index: chrome/browser/extensions/extension_crash_recovery_browsertest.cc |
diff --git a/chrome/browser/extensions/extension_crash_recovery_browsertest.cc b/chrome/browser/extensions/extension_crash_recovery_browsertest.cc |
index 1914ec7a8a80ea9d8e4ce5ad024c6352584f5e16..91c7c7f4d5895e531d44dd13df4017dd49c0cb3e 100644 |
--- a/chrome/browser/extensions/extension_crash_recovery_browsertest.cc |
+++ b/chrome/browser/extensions/extension_crash_recovery_browsertest.cc |
@@ -7,7 +7,7 @@ |
#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" |
@@ -19,8 +19,8 @@ |
class ExtensionCrashRecoveryTest : public ExtensionBrowserTest { |
protected: |
- ExtensionsService* GetExtensionsService() { |
- return browser()->profile()->GetExtensionsService(); |
+ ExtensionService* GetExtensionService() { |
+ return browser()->profile()->GetExtensionService(); |
} |
ExtensionProcessManager* GetExtensionProcessManager() { |
@@ -51,9 +51,9 @@ class ExtensionCrashRecoveryTest : public ExtensionBrowserTest { |
} |
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 = |
@@ -69,9 +69,9 @@ class ExtensionCrashRecoveryTest : public ExtensionBrowserTest { |
} |
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); |
@@ -84,21 +84,21 @@ class ExtensionCrashRecoveryTest : public ExtensionBrowserTest { |
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); |
@@ -109,10 +109,10 @@ class ExtensionCrashRecoveryTest : public ExtensionBrowserTest { |
}; |
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"); |
@@ -120,10 +120,10 @@ IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, Basic) { |
} |
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_); |
@@ -132,10 +132,10 @@ IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, CloseAndReload) { |
} |
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_); |
@@ -154,18 +154,18 @@ IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, ReloadIndependently) { |
// 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"); |
@@ -174,11 +174,11 @@ IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, TwoExtensionsCrashFirst) { |
} |
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"); |
@@ -188,13 +188,13 @@ IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, TwoExtensionsCrashSecond) { |
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"); |
@@ -211,13 +211,13 @@ IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, |
} |
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"); |
@@ -238,42 +238,42 @@ IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, TwoExtensionsOneByOne) { |
// 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"); |