diff options
| author | reillyg <reillyg@chromium.org> | 2014-10-28 08:30:23 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-28 15:30:47 +0000 |
| commit | 0ea3fa90a36f091c943e286ade39b0252e5d34d7 (patch) | |
| tree | 46bbe1b91e168c2d172699f5a1a52dd8634f33be /chrome/browser/extensions/process_manager_browsertest.cc | |
| parent | ecfca4638d05a0f4b5839f52a00ed4ebc4d3f756 (diff) | |
| download | chromium_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/process_manager_browsertest.cc')
| -rw-r--r-- | chrome/browser/extensions/process_manager_browsertest.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome/browser/extensions/process_manager_browsertest.cc b/chrome/browser/extensions/process_manager_browsertest.cc index 2395966..9f2495b 100644 --- a/chrome/browser/extensions/process_manager_browsertest.cc +++ b/chrome/browser/extensions/process_manager_browsertest.cc @@ -13,7 +13,6 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/web_contents.h" #include "content/public/test/test_utils.h" -#include "extensions/browser/extension_system.h" #include "net/dns/mock_host_resolver.h" #include "net/test/embedded_test_server/embedded_test_server.h" @@ -27,7 +26,7 @@ typedef ExtensionBrowserTest ProcessManagerBrowserTest; // and background pages. IN_PROC_BROWSER_TEST_F(ProcessManagerBrowserTest, ExtensionHostCreation) { - ProcessManager* pm = ExtensionSystem::Get(profile())->process_manager(); + ProcessManager* pm = ProcessManager::Get(profile()); // We start with no background hosts. ASSERT_EQ(0u, pm->background_hosts().size()); @@ -68,7 +67,7 @@ IN_PROC_BROWSER_TEST_F(ProcessManagerBrowserTest, // Disabled due to flake, see http://crbug.com/315242 IN_PROC_BROWSER_TEST_F(ProcessManagerBrowserTest, DISABLED_PopupHostCreation) { - ProcessManager* pm = ExtensionSystem::Get(profile())->process_manager(); + ProcessManager* pm = ProcessManager::Get(profile()); // Load an extension with the ability to open a popup but no background // page. @@ -111,7 +110,7 @@ IN_PROC_BROWSER_TEST_F(ProcessManagerBrowserTest, // interact with an installed extension with that ID. Regression test // for bug 357382. IN_PROC_BROWSER_TEST_F(ProcessManagerBrowserTest, HttpHostMatchingExtensionId) { - ProcessManager* pm = ExtensionSystem::Get(profile())->process_manager(); + ProcessManager* pm = ProcessManager::Get(profile()); // We start with no background hosts. ASSERT_EQ(0u, pm->background_hosts().size()); |