| Index: chrome/browser/renderer_host/chrome_render_message_filter.cc
|
| diff --git a/chrome/browser/renderer_host/chrome_render_message_filter.cc b/chrome/browser/renderer_host/chrome_render_message_filter.cc
|
| index b31e75a650d70108503ef9e5937e3ecc1c21552d..6ce83ba69b230b19e0a43de266937bdc99acc260 100644
|
| --- a/chrome/browser/renderer_host/chrome_render_message_filter.cc
|
| +++ b/chrome/browser/renderer_host/chrome_render_message_filter.cc
|
| @@ -18,7 +18,6 @@
|
| #include "chrome/browser/extensions/extension_message_service.h"
|
| #include "chrome/browser/extensions/extension_process_manager.h"
|
| #include "chrome/browser/extensions/extension_system.h"
|
| -#include "chrome/browser/extensions/extension_system_factory.h"
|
| #include "chrome/browser/metrics/histogram_synchronizer.h"
|
| #include "chrome/browser/nacl_host/nacl_process_host.h"
|
| #include "chrome/browser/net/chrome_url_request_context.h"
|
| @@ -56,7 +55,7 @@ ChromeRenderMessageFilter::ChromeRenderMessageFilter(
|
| profile_(profile),
|
| request_context_(request_context),
|
| extension_info_map_(
|
| - ExtensionSystemFactory::GetForProfile(profile)->info_map()),
|
| + ExtensionSystem::Get(profile)->info_map()),
|
| cookie_settings_(CookieSettings::Factory::GetForProfile(profile)),
|
| weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
|
| }
|
| @@ -268,7 +267,7 @@ void ChromeRenderMessageFilter::OpenChannelToExtensionOnUIThread(
|
| const std::string& target_extension_id,
|
| const std::string& channel_name) {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| - ExtensionSystemFactory::GetForProfile(profile_)->message_service()->
|
| + ExtensionSystem::Get(profile_)->message_service()->
|
| OpenChannelToExtension(
|
| source_process_id, source_routing_id, receiver_port_id,
|
| source_extension_id, target_extension_id, channel_name);
|
| @@ -294,7 +293,7 @@ void ChromeRenderMessageFilter::OpenChannelToTabOnUIThread(
|
| const std::string& extension_id,
|
| const std::string& channel_name) {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| - ExtensionSystemFactory::GetForProfile(profile_)->message_service()->
|
| + ExtensionSystem::Get(profile_)->message_service()->
|
| OpenChannelToTab(
|
| source_process_id, source_routing_id, receiver_port_id,
|
| tab_id, extension_id, channel_name);
|
| @@ -387,7 +386,7 @@ void ChromeRenderMessageFilter::OnExtensionCloseChannel(int port_id,
|
| return; // To guard against crash in browser_tests shutdown.
|
|
|
| ExtensionMessageService* message_service =
|
| - ExtensionSystemFactory::GetForProfile(profile_)->message_service();
|
| + ExtensionSystem::Get(profile_)->message_service();
|
| if (message_service)
|
| message_service->CloseChannel(port_id, connection_error);
|
| }
|
|
|