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

chrome/browser/renderer_host/render_process_host.h

 // Copyright (c) 2009 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.
 
 #ifndef CHROME_BROWSER_RENDERER_HOST_RENDER_PROCESS_HOST_H_
 #define CHROME_BROWSER_RENDERER_HOST_RENDER_PROCESS_HOST_H_
 
 #include <set>
 #include <string>
 
@@ skipping 130 matching lines @@
   bool fast_shutdown_started() {
     return fast_shutdown_started_;
   }
 
   // Virtual interface ---------------------------------------------------------
 
   // Initialize the new renderer process, returning true on success. This must
   // 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;
 
   // Called on the UI thread to cancel any outstanding resource requests for
   // the specified render widget.
   virtual void CancelResourceRequests(int render_widget_id) = 0;
 
   // Called on the UI thread to simulate a ClosePage_ACK message to the
   // ResourceDispatcherHost.  Necessary for a cross-site request, in the case
@@ skipping 147 matching lines @@
 // Factory object for RenderProcessHosts. Using this factory allows tests to
 // swap out a different one to use a TestRenderProcessHost.
 class RenderProcessHostFactory {
  public:
   virtual ~RenderProcessHostFactory() {}
   virtual RenderProcessHost* CreateRenderProcessHost(
       Profile* profile) const = 0;
 };
 
 #endif  // CHROME_BROWSER_RENDERER_HOST_RENDER_PROCESS_HOST_H_