diff options
Diffstat (limited to 'chrome/browser/chromeos')
5 files changed, 9 insertions, 15 deletions
diff --git a/chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc b/chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc index ef85a8d..7dc34ef 100644 --- a/chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc +++ b/chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc @@ -83,9 +83,9 @@ class LoggedInSpokenFeedbackTest : public InProcessBrowserTest { void RunJavaScriptInChromeVoxBackgroundPage(const std::string& script) { extensions::ExtensionHost* host = - extensions::ExtensionSystem::Get(browser()->profile())-> - process_manager()->GetBackgroundHostForExtension( - extension_misc::kChromeVoxExtensionId); + extensions::ProcessManager::Get(browser()->profile()) + ->GetBackgroundHostForExtension( + extension_misc::kChromeVoxExtensionId); CHECK(content::ExecuteScript(host->host_contents(), script)); } diff --git a/chrome/browser/chromeos/extensions/file_manager/event_router.cc b/chrome/browser/chromeos/extensions/file_manager/event_router.cc index 9e0604c..3076761 100644 --- a/chrome/browser/chromeos/extensions/file_manager/event_router.cc +++ b/chrome/browser/chromeos/extensions/file_manager/event_router.cc @@ -44,7 +44,6 @@ #include "extensions/browser/event_router.h" #include "extensions/browser/extension_host.h" #include "extensions/browser/extension_prefs.h" -#include "extensions/browser/extension_system.h" #include "storage/common/fileapi/file_system_types.h" #include "storage/common/fileapi/file_system_util.h" @@ -271,13 +270,9 @@ std::string FileErrorToErrorName(base::File::Error error_code) { void GrantAccessForAddedProfileToRunningInstance(Profile* added_profile, Profile* running_profile) { - extensions::ProcessManager* const process_manager = - extensions::ExtensionSystem::Get(running_profile)->process_manager(); - if (!process_manager) - return; - extensions::ExtensionHost* const extension_host = - process_manager->GetBackgroundHostForExtension(kFileManagerAppId); + extensions::ProcessManager::Get(running_profile) + ->GetBackgroundHostForExtension(kFileManagerAppId); if (!extension_host || !extension_host->render_process_host()) return; diff --git a/chrome/browser/chromeos/file_manager/file_browser_handlers.cc b/chrome/browser/chromeos/file_manager/file_browser_handlers.cc index 0b40283..e326fb0 100644 --- a/chrome/browser/chromeos/file_manager/file_browser_handlers.cc +++ b/chrome/browser/chromeos/file_manager/file_browser_handlers.cc @@ -61,7 +61,7 @@ int ExtractProcessFromExtensionId(Profile* profile, GURL extension_url = Extension::GetBaseURLFromExtensionId(extension_id); extensions::ProcessManager* manager = - extensions::ExtensionSystem::Get(profile)->process_manager(); + extensions::ProcessManager::Get(profile); SiteInstance* site_instance = manager->GetSiteInstanceForURL(extension_url); if (!site_instance || !site_instance->HasProcess()) diff --git a/chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc b/chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc index efdebc5..1e8d23c 100644 --- a/chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc +++ b/chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc @@ -247,8 +247,7 @@ IN_PROC_BROWSER_TEST_P(InputMethodEngineBrowserTest, ASSERT_TRUE(engine_handler); extensions::ExtensionHost* host = - extensions::ExtensionSystem::Get(profile()) - ->process_manager() + extensions::ProcessManager::Get(profile()) ->GetBackgroundHostForExtension(extension_->id()); ASSERT_TRUE(host); diff --git a/chrome/browser/chromeos/login/signin/oauth2_browsertest.cc b/chrome/browser/chromeos/login/signin/oauth2_browsertest.cc index 5523b00..ca33dd9 100644 --- a/chrome/browser/chromeos/login/signin/oauth2_browsertest.cc +++ b/chrome/browser/chromeos/login/signin/oauth2_browsertest.cc @@ -660,7 +660,7 @@ class MergeSessionTest : public OAuth2Test { const GURL& GetBackGroundPageUrl(const std::string& extension_id) { extensions::ProcessManager* manager = - extensions::ExtensionSystem::Get(profile())->process_manager(); + extensions::ProcessManager::Get(profile()); extensions::ExtensionHost* host = manager->GetBackgroundHostForExtension(extension_id); return host->host_contents()->GetURL(); @@ -669,7 +669,7 @@ class MergeSessionTest : public OAuth2Test { void JsExpectOnBackgroundPage(const std::string& extension_id, const std::string& expression) { extensions::ProcessManager* manager = - extensions::ExtensionSystem::Get(profile())->process_manager(); + extensions::ProcessManager::Get(profile()); extensions::ExtensionHost* host = manager->GetBackgroundHostForExtension(extension_id); if (host == NULL) { |