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

chrome/browser/renderer_host/browser_render_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.
 
 // Represents the browser side of the browser <--> renderer communication
 // channel. There will be one RenderProcessHost per renderer process.
 
 #include "chrome/browser/renderer_host/browser_render_process_host.h"
 
 #include <algorithm>
@@ skipping 39 matching lines @@
 #include "chrome/browser/renderer_host/audio_renderer_host.h"
 #include "chrome/browser/renderer_host/blob_message_filter.h"
 #include "chrome/browser/renderer_host/database_message_filter.h"
 #include "chrome/browser/renderer_host/file_utilities_message_filter.h"
 #include "chrome/browser/renderer_host/pepper_file_message_filter.h"
 #include "chrome/browser/renderer_host/render_message_filter.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/renderer_host/render_view_host_delegate.h"
 #include "chrome/browser/renderer_host/render_widget_helper.h"
 #include "chrome/browser/renderer_host/render_widget_host.h"
+#include "chrome/browser/renderer_host/resource_message_filter.h"
 #include "chrome/browser/renderer_host/socket_stream_dispatcher_host.h"
 #include "chrome/browser/renderer_host/web_cache_manager.h"
 #include "chrome/browser/safe_browsing/client_side_detection_service.h"
 #include "chrome/browser/search_engines/search_provider_install_state_message_filter.h"
 #include "chrome/browser/speech/speech_input_dispatcher_host.h"
 #include "chrome/browser/spellcheck_host.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/visitedlink/visitedlink_master.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 143 matching lines @@
     // Go ahead and send whatever we already have buffered up.
     Update(sender);
   }
 
  private:
   bool reset_needed_;
   bool has_receiver_;
   VisitedLinkCommon::Fingerprints pending_;
 };
 
+namespace {

[brettw, 2010/12/15 21:31:10]

Usually we'd put anonymous namespace first. In this case, it seems like most of
the stuff previously in this file can be in this anonymous namespace. Can you
mess around with that?

[jam, 2010/12/15 21:41:04]

I had tried that, but those classes are forward declared in the header and used
in scoped_ptrs, so it can't be done

+
+// Helper class that we pass to ResourceMessageFilter so that it can find the
+// right URLRequestContext for a request.
+class RendererURLRequestContextOverride
+    : public ResourceMessageFilter::URLRequestContextOverride {
+ public:
+  explicit RendererURLRequestContextOverride(Profile* profile)
+    : request_context_(profile->GetRequestContext()),

[brettw, 2010/12/15 21:31:10]

2 more spaces indent.

[jam, 2010/12/15 21:41:04]

Done.

+      media_request_context_(profile->GetRequestContextForMedia()) {
+  }
+
+  virtual URLRequestContext* GetRequestContext(
+      uint32 request_id, ResourceType::Type resource_type) {
+    URLRequestContextGetter* request_context = request_context_;
+    // If the request has resource type of ResourceType::MEDIA, we use a request
+    // context specific to media for handling it because these resources have
+    // specific needs for caching.
+    if (resource_type == ResourceType::MEDIA)
+      request_context = media_request_context_;
+    return request_context->GetURLRequestContext();
+  }
+
+ private:
+  scoped_refptr<URLRequestContextGetter> request_context_;
+  scoped_refptr<URLRequestContextGetter> media_request_context_;
+};
+
+}  // namespace
+
 BrowserRenderProcessHost::BrowserRenderProcessHost(Profile* profile)
     : RenderProcessHost(profile),
       visible_widgets_(0),
       backgrounded_(true),
       ALLOW_THIS_IN_INITIALIZER_LIST(cached_dibs_cleaner_(
             base::TimeDelta::FromSeconds(5),
             this, &BrowserRenderProcessHost::ClearTransportDIBCache)),
       accessibility_enabled_(false),
       extension_process_(false),
       callback_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
@@ skipping 149 matching lines @@
         this));
 
     fast_shutdown_started_ = false;
   }
 
   return true;
 }
 
 void BrowserRenderProcessHost::CreateMessageFilters() {
   scoped_refptr<RenderMessageFilter> render_message_filter(
-      new RenderMessageFilter(g_browser_process->resource_dispatcher_host(),
-                              id(),
+      new RenderMessageFilter(id(),
                               PluginService::GetInstance(),
-                              g_browser_process->print_job_manager(),
                               profile(),
                               widget_helper_));
   channel_->AddFilter(render_message_filter);
 
+  scoped_refptr<RendererURLRequestContextOverride> url_request_context_override(
+      new RendererURLRequestContextOverride(profile()));
+
+  ResourceMessageFilter* resource_message_filter = new ResourceMessageFilter(
+      id(), ChildProcessInfo::RENDER_PROCESS,
+      g_browser_process->resource_dispatcher_host());
+  resource_message_filter->set_url_request_context_override(
+      url_request_context_override);
+  channel_->AddFilter(resource_message_filter);
+
   channel_->AddFilter(new AudioRendererHost());
   channel_->AddFilter(
       new AppCacheDispatcherHost(profile()->GetRequestContext(), id()));
   channel_->AddFilter(new DOMStorageMessageFilter(id(), profile()));
   channel_->AddFilter(new IndexedDBDispatcherHost(id(), profile()));
   channel_->AddFilter(
       GeolocationDispatcherHost::New(
           id(), profile()->GetGeolocationPermissionContext()));
   channel_->AddFilter(new PepperFileMessageFilter(id(), profile()));
   channel_->AddFilter(new speech_input::SpeechInputDispatcherHost(id()));
@@ skipping 835 matching lines @@
     IPC::PlatformFileForTransit file;
 #if defined(OS_POSIX)
     file = base::FileDescriptor(model_file, false);
 #elif defined(OS_WIN)
     ::DuplicateHandle(::GetCurrentProcess(), model_file, GetHandle(), &file, 0,
                       false, DUPLICATE_SAME_ACCESS);
 #endif
     Send(new ViewMsg_SetPhishingModel(file));
   }
 }