diff options
Diffstat (limited to 'chrome/browser/extensions')
6 files changed, 16 insertions, 15 deletions
diff --git a/chrome/browser/extensions/extension_function_dispatcher.cc b/chrome/browser/extensions/extension_function_dispatcher.cc index 812e277..0a0b8c9 100644 --- a/chrome/browser/extensions/extension_function_dispatcher.cc +++ b/chrome/browser/extensions/extension_function_dispatcher.cc @@ -219,7 +219,7 @@ ExtensionFunctionDispatcher::ExtensionFunctionDispatcher( // Notify the ExtensionProcessManager that the view was created. ExtensionProcessManager* epm = profile()->GetExtensionProcessManager(); epm->RegisterExtensionProcess(extension_id(), - render_view_host->process()->pid()); + render_view_host->process()->id()); // Update the extension permissions. Doing this each time we create an EFD // ensures that new processes are informed of permissions for newly installed @@ -264,7 +264,7 @@ void ExtensionFunctionDispatcher::SendResponse(ExtensionFunction* function, void ExtensionFunctionDispatcher::HandleBadMessage(ExtensionFunction* api) { LOG(ERROR) << "bad extension message " << - api->name() << + api->name() << " : terminating renderer."; if (RenderProcessHost::run_renderer_in_process()) { // In single process mode it is better if we don't suicide but just crash. diff --git a/chrome/browser/extensions/extension_message_service.cc b/chrome/browser/extensions/extension_message_service.cc index 3b7e1fa..70396c4 100644 --- a/chrome/browser/extensions/extension_message_service.cc +++ b/chrome/browser/extensions/extension_message_service.cc @@ -202,15 +202,16 @@ int ExtensionMessageService::OpenChannelToExtension( ui_loop_->PostTask(FROM_HERE, NewRunnableMethod(this, &ExtensionMessageService::OpenChannelToExtensionOnUIThread, - source->GetProcessId(), routing_id, port2_id, extension_id, - channel_name)); + source->id(), routing_id, port2_id, extension_id, channel_name)); return port1_id; } -int ExtensionMessageService::OpenChannelToTab( - int routing_id, int tab_id, const std::string& extension_id, - const std::string& channel_name, ResourceMessageFilter* source) { +int ExtensionMessageService::OpenChannelToTab(int routing_id, + int tab_id, + const std::string& extension_id, + const std::string& channel_name, + ResourceMessageFilter* source) { DCHECK_EQ(MessageLoop::current(), ChromeThread::GetMessageLoop(ChromeThread::IO)); @@ -224,7 +225,7 @@ int ExtensionMessageService::OpenChannelToTab( ui_loop_->PostTask(FROM_HERE, NewRunnableMethod(this, &ExtensionMessageService::OpenChannelToTabOnUIThread, - source->GetProcessId(), routing_id, port2_id, tab_id, extension_id, + source->id(), routing_id, port2_id, tab_id, extension_id, channel_name)); return port1_id; @@ -434,8 +435,8 @@ void ExtensionMessageService::Observe(NotificationType type, for (ListenerMap::iterator it = listeners_.begin(); it != listeners_.end(); ) { ListenerMap::iterator current = it++; - if (current->second.count(renderer->pid()) != 0) - RemoveEventListener(current->first, renderer->pid()); + if (current->second.count(renderer->id()) != 0) + RemoveEventListener(current->first, renderer->id()); } break; } diff --git a/chrome/browser/extensions/extension_process_manager.cc b/chrome/browser/extensions/extension_process_manager.cc index 05a61a1..a8731d9 100644 --- a/chrome/browser/extensions/extension_process_manager.cc +++ b/chrome/browser/extensions/extension_process_manager.cc @@ -185,7 +185,7 @@ void ExtensionProcessManager::Observe(NotificationType type, case NotificationType::RENDERER_PROCESS_TERMINATED: case NotificationType::RENDERER_PROCESS_CLOSED: { RenderProcessHost* host = Source<RenderProcessHost>(source).ptr(); - UnregisterExtensionProcess(host->pid()); + UnregisterExtensionProcess(host->id()); break; } diff --git a/chrome/browser/extensions/extensions_ui.cc b/chrome/browser/extensions/extensions_ui.cc index 998ed32..8942c8d 100644 --- a/chrome/browser/extensions/extensions_ui.cc +++ b/chrome/browser/extensions/extensions_ui.cc @@ -317,7 +317,7 @@ std::vector<ExtensionPage> ExtensionsDOMHandler::GetActivePagesForExtension( RenderViewHost* view = (*iter)->render_view_host(); if ((*iter)->extension_id() == extension_id && view) { result.push_back(ExtensionPage((*iter)->url(), - view->process()->pid(), + view->process()->id(), view->routing_id())); } } diff --git a/chrome/browser/extensions/user_script_listener.cc b/chrome/browser/extensions/user_script_listener.cc index 94b58bf..086fc38 100644 --- a/chrome/browser/extensions/user_script_listener.cc +++ b/chrome/browser/extensions/user_script_listener.cc @@ -66,7 +66,7 @@ bool UserScriptListener::ShouldStartRequest(URLRequest* request) { // Queue this request up. delayed_request_ids_.push_front(ResourceDispatcherHost::GlobalRequestID( - info->process_id, info->request_id)); + info->child_id, info->request_id)); return false; } diff --git a/chrome/browser/extensions/user_script_listener_unittest.cc b/chrome/browser/extensions/user_script_listener_unittest.cc index d4fb326..ee5299f 100644 --- a/chrome/browser/extensions/user_script_listener_unittest.cc +++ b/chrome/browser/extensions/user_script_listener_unittest.cc @@ -65,7 +65,7 @@ class ResourceDispatcherHostTester : public base::RefCountedThreadSafe<ResourceDispatcherHostTester> { public: ResourceDispatcherHostTester(MessageLoop* io_loop) - : Receiver(ChildProcessInfo::RENDER_PROCESS), + : Receiver(ChildProcessInfo::RENDER_PROCESS, -1), host_(io_loop), ui_loop_(MessageLoop::current()), io_loop_(io_loop) { @@ -136,7 +136,7 @@ class ResourceDispatcherHostTester : // init the rest to default values to prevent getting UMR. request.frame_origin = "null"; request.main_frame_origin = "null"; - request.origin_pid = 0; + request.origin_child_id = 0; request.request_context = 0; request.appcache_host_id = appcache::kNoHostId; return request; |