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

chrome/browser/renderer_host/render_view_host.h

 // 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.
 
 #ifndef CHROME_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_H_
 #define CHROME_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 90 matching lines @@
                  int routing_id,
                  int64 session_storage_namespace_id);
   virtual ~RenderViewHost();
 
   SiteInstance* site_instance() const { return instance_; }
   RenderViewHostDelegate* delegate() const { return delegate_; }
 
   // Set up the RenderView child process. Virtual because it is overridden by
   // TestRenderViewHost. If the |frame_name| parameter is non-empty, it is used
   // as the name of the new top-level frame.
-  virtual bool CreateRenderView(URLRequestContextGetter* request_context,
-                                const string16& frame_name);
+  virtual bool CreateRenderView(const string16& frame_name);
 
   // Returns true if the RenderView is active and has not crashed. Virtual
   // because it is overridden by TestRenderViewHost.
   virtual bool IsRenderViewLive() const;
 
   // Send the renderer process the current preferences supplied by the
   // RenderViewHostDelegate.
   void SyncRendererPrefs();
 
   // Sends the given navigation message. Use this rather than sending it
@@ skipping 606 matching lines @@
   int autofill_query_id_;
   std::vector<string16> autofill_values_;
   std::vector<string16> autofill_labels_;
   std::vector<string16> autofill_icons_;
   std::vector<int> autofill_unique_ids_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderViewHost);
 };
 
 #endif  // CHROME_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_H_