Create a ResourceMessageFilter to filter resource related IPCs. This gets ri...

chrome/browser/browser_child_process_host.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/browser_child_process_host.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
@@ skipping 43 matching lines @@
 
  private:
   NotificationType notification_type_;
   ChildProcessInfo info_;
 };
 
 }  // namespace
 
 
 BrowserChildProcessHost::BrowserChildProcessHost(
-    ProcessType type, ResourceDispatcherHost* resource_dispatcher_host)
-    : Receiver(type, -1),
+    ChildProcessInfo::ProcessType type,
+    ResourceDispatcherHost* resource_dispatcher_host,
+    ResourceMessageFilter::URLRequestContextOverride*
+        url_request_context_override)
+    : ChildProcessInfo(type, -1),
       ALLOW_THIS_IN_INITIALIZER_LIST(client_(this)),
       resource_dispatcher_host_(resource_dispatcher_host) {
+  Initialize(url_request_context_override);
+}
+
+BrowserChildProcessHost::BrowserChildProcessHost(
+    ChildProcessInfo::ProcessType type,
+    ResourceDispatcherHost* resource_dispatcher_host)
+    : ChildProcessInfo(type, -1),
+      ALLOW_THIS_IN_INITIALIZER_LIST(client_(this)),
+      resource_dispatcher_host_(resource_dispatcher_host) {
+  Initialize(NULL);
+}
+
+void BrowserChildProcessHost::Initialize(
+    ResourceMessageFilter::URLRequestContextOverride*
+        url_request_context_override) {
+  if (resource_dispatcher_host_) {
+    ResourceMessageFilter* resource_message_filter = new ResourceMessageFilter(
+        id(), type(), resource_dispatcher_host_);
+    if (url_request_context_override) {
+      resource_message_filter->set_url_request_context_override(
+        url_request_context_override);
+    }
+    AddFilter(resource_message_filter);
+  }
+
   g_child_process_list.Get().push_back(this);
 }
 
-
 BrowserChildProcessHost::~BrowserChildProcessHost() {
   g_child_process_list.Get().remove(this);
-
-  if (resource_dispatcher_host_)
-    resource_dispatcher_host_->CancelRequestsForProcess(id());
 }
 
 // static
 void BrowserChildProcessHost::SetCrashReporterCommandLine(
     CommandLine* command_line) {
 #if defined(USE_LINUX_BREAKPAD)
   if (IsCrashReporterEnabled()) {
     command_line->AppendSwitchASCII(switches::kEnableCrashReporter,
         child_process_logging::GetClientId() + "," + base::GetLinuxDistro());
   }
@@ skipping 33 matching lines @@
 }
 
 base::ProcessHandle BrowserChildProcessHost::GetChildProcessHandle() const {
   DCHECK(child_process_.get())
       << "Requesting a child process handle before launching.";
   DCHECK(child_process_->GetHandle())
       << "Requesting a child process handle before launch has completed OK.";
   return child_process_->GetHandle();
 }
 
-bool BrowserChildProcessHost::Send(IPC::Message* msg) {
-  return SendOnChannel(msg);
-}
-
 void BrowserChildProcessHost::ForceShutdown() {
   g_child_process_list.Get().remove(this);
   ChildProcessHost::ForceShutdown();
 }
 
 void BrowserChildProcessHost::Notify(NotificationType type) {
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE, new ChildNotificationTask(type, this));
 }
 
@@ skipping 25 matching lines @@
       }
       default:
         break;
     }
     // Notify in the main loop of the disconnection.
     Notify(NotificationType::CHILD_PROCESS_HOST_DISCONNECTED);
   }
   ChildProcessHost::OnChildDied();
 }
 
-bool BrowserChildProcessHost::InterceptMessageFromChild(
-    const IPC::Message& msg) {
-  bool msg_is_ok = true;
-  bool handled = false;
-  if (resource_dispatcher_host_) {
-    handled = resource_dispatcher_host_->OnMessageReceived(
-        msg, this, &msg_is_ok);
-  }
-  if (!handled && (msg.type() == PluginProcessHostMsg_ShutdownRequest::ID)) {
-    // Must remove the process from the list now, in case it gets used for a
-    // new instance before our watcher tells us that the process terminated.
-    g_child_process_list.Get().remove(this);
-  }
-  if (!msg_is_ok)
-    base::KillProcess(handle(), ResultCodes::KILLED_BAD_MESSAGE, false);
-  return handled;
+void BrowserChildProcessHost::ShutdownStarted() {
+  // Must remove the process from the list now, in case it gets used for a
+  // new instance before our watcher tells us that the process terminated.
+  g_child_process_list.Get().remove(this);
 }
 
 BrowserChildProcessHost::ClientHook::ClientHook(BrowserChildProcessHost* host)
     : host_(host) {
 }
 
 void BrowserChildProcessHost::ClientHook::OnProcessLaunched() {
   if (!host_->child_process_->GetHandle()) {
     host_->OnChildDied();
     return;
   }
   host_->set_handle(host_->child_process_->GetHandle());
   host_->OnProcessLaunched();
 }
 
 BrowserChildProcessHost::Iterator::Iterator()
     : all_(true), type_(UNKNOWN_PROCESS) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)) <<
           "ChildProcessInfo::Iterator must be used on the IO thread.";
   iterator_ = g_child_process_list.Get().begin();
 }
 
-BrowserChildProcessHost::Iterator::Iterator(ProcessType type)
+BrowserChildProcessHost::Iterator::Iterator(ChildProcessInfo::ProcessType type)
     : all_(false), type_(type) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)) <<
           "ChildProcessInfo::Iterator must be used on the IO thread.";
   iterator_ = g_child_process_list.Get().begin();
   if (!Done() && (*iterator_)->type() != type_)
     ++(*this);
 }
 
 BrowserChildProcessHost* BrowserChildProcessHost::Iterator::operator++() {
   do {
     ++iterator_;
     if (Done())
       break;
 
     if (!all_ && (*iterator_)->type() != type_)
       continue;
 
     return *iterator_;
   } while (true);
 
   return NULL;
 }
 
 bool BrowserChildProcessHost::Iterator::Done() {
   return iterator_ == g_child_process_list.Get().end();
 }