Merge 54867 - ChromeFrame currently overrides the request context for interce...

chrome/browser/renderer_host/render_process_host.h

Index: chrome/browser/renderer_host/render_process_host.h
===================================================================
--- chrome/browser/renderer_host/render_process_host.h	(revision 56788)
+++ chrome/browser/renderer_host/render_process_host.h	(working copy)
@@ -148,8 +148,7 @@
   // be called once before the object can be used, but can be called after
   // that with no effect. Therefore, if the caller isn't sure about whether
   // the process has been created, it should just call Init().
-  virtual bool Init(bool is_extensions_process,
-                    URLRequestContextGetter* request_context) = 0;
+  virtual bool Init(bool is_extensions_process) = 0;
 
   // Gets the next available routing id.
   virtual int GetNextRoutingID() = 0;