summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/lazy_background_page_apitest.cc
diff options
context:
space:
mode:
authorreillyg <reillyg@chromium.org>2014-10-28 08:30:23 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-28 15:30:47 +0000
commit0ea3fa90a36f091c943e286ade39b0252e5d34d7 (patch)
tree46bbe1b91e168c2d172699f5a1a52dd8634f33be /chrome/browser/extensions/lazy_background_page_apitest.cc
parentecfca4638d05a0f4b5839f52a00ed4ebc4d3f756 (diff)
downloadchromium_src-0ea3fa90a36f091c943e286ade39b0252e5d34d7.zip
chromium_src-0ea3fa90a36f091c943e286ade39b0252e5d34d7.tar.gz
chromium_src-0ea3fa90a36f091c943e286ade39b0252e5d34d7.tar.bz2
Extract ProcessManager from ExtensionSystem.
This change removes ProcessManager's //chrome dependency because while ProcessManager and ExtensionSystem are in //extensions the ExtensionSystemFactory is in //chrome. This allows a service in //extensions to declare a dependency on the ProcessManager's factory directly. Most of this patch is changing, extensions::ExtensionSystem::Get(profile_)->process_manager() to, extensions::ProcessManager::Get(profile_). BUG= TBR=erikwright@chromium.org Review URL: https://codereview.chromium.org/671763002 Cr-Commit-Position: refs/heads/master@{#301636}
Diffstat (limited to 'chrome/browser/extensions/lazy_background_page_apitest.cc')
-rw-r--r--chrome/browser/extensions/lazy_background_page_apitest.cc17
1 files changed, 7 insertions, 10 deletions
diff --git a/chrome/browser/extensions/lazy_background_page_apitest.cc b/chrome/browser/extensions/lazy_background_page_apitest.cc
index 509db41..5abc756 100644
--- a/chrome/browser/extensions/lazy_background_page_apitest.cc
+++ b/chrome/browser/extensions/lazy_background_page_apitest.cc
@@ -8,7 +8,6 @@
#include "chrome/browser/bookmarks/bookmark_model_factory.h"
#include "chrome/browser/extensions/browser_action_test_util.h"
#include "chrome/browser/extensions/extension_apitest.h"
-#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/lazy_background_page_test_util.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser.h"
@@ -26,7 +25,6 @@
#include "extensions/browser/extension_host.h"
#include "extensions/browser/extension_registry.h"
#include "extensions/browser/extension_registry_observer.h"
-#include "extensions/browser/extension_system.h"
#include "extensions/browser/process_manager.h"
#include "extensions/common/extension.h"
#include "extensions/test/extension_test_message_listener.h"
@@ -107,8 +105,8 @@ class LazyBackgroundPageApiTest : public ExtensionApiTest {
// Returns true if the lazy background page for the extension with
// |extension_id| is still running.
bool IsBackgroundPageAlive(const std::string& extension_id) {
- extensions::ProcessManager* pm = extensions::ExtensionSystem::Get(
- browser()->profile())->process_manager();
+ extensions::ProcessManager* pm =
+ extensions::ProcessManager::Get(browser()->profile());
return pm->GetBackgroundHostForExtension(extension_id);
}
@@ -226,7 +224,7 @@ IN_PROC_BROWSER_TEST_F(LazyBackgroundPageApiTest, WaitForDialog) {
// Close the dialog. The keep alive count is decremented.
extensions::ProcessManager* pm =
- extensions::ExtensionSystem::Get(browser()->profile())->process_manager();
+ extensions::ProcessManager::Get(browser()->profile());
int previous_keep_alive_count = pm->GetLazyKeepaliveCount(extension);
dialog->CloseModalDialog();
EXPECT_EQ(previous_keep_alive_count - 1,
@@ -282,7 +280,7 @@ IN_PROC_BROWSER_TEST_F(LazyBackgroundPageApiTest, WaitForRequest) {
// Lazy Background Page still exists, because the extension started a request.
extensions::ProcessManager* pm =
- extensions::ExtensionSystem::Get(browser()->profile())->process_manager();
+ extensions::ProcessManager::Get(browser()->profile());
extensions::ExtensionHost* host =
pm->GetBackgroundHostForExtension(last_loaded_extension_id());
ASSERT_TRUE(host);
@@ -350,10 +348,9 @@ IN_PROC_BROWSER_TEST_F(LazyBackgroundPageApiTest, DISABLED_IncognitoSplitMode) {
// Lazy Background Page doesn't exist yet.
extensions::ProcessManager* pm =
- extensions::ExtensionSystem::Get(browser()->profile())->process_manager();
+ extensions::ProcessManager::Get(browser()->profile());
extensions::ProcessManager* pmi =
- extensions::ExtensionSystem::Get(incognito_browser->profile())->
- process_manager();
+ extensions::ProcessManager::Get(incognito_browser->profile());
EXPECT_FALSE(pm->GetBackgroundHostForExtension(last_loaded_extension_id()));
EXPECT_FALSE(pmi->GetBackgroundHostForExtension(last_loaded_extension_id()));
@@ -440,7 +437,7 @@ IN_PROC_BROWSER_TEST_F(LazyBackgroundPageApiTest, ImpulseAddsCount) {
// Lazy Background Page doesn't exist yet.
extensions::ProcessManager* pm =
- extensions::ExtensionSystem::Get(browser()->profile())->process_manager();
+ extensions::ProcessManager::Get(browser()->profile());
EXPECT_FALSE(pm->GetBackgroundHostForExtension(last_loaded_extension_id()));
EXPECT_EQ(1, browser()->tab_strip_model()->count());