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

chrome/browser/tab_contents/tab_contents.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_TAB_CONTENTS_TAB_CONTENTS_H_
 #define CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
 
 #include "build/build_config.h"
 
 #include <deque>
@@ skipping 626 matching lines @@
   // Set the time when we started to create the new tab page.  This time is
   // from before we created this TabContents.
   void set_new_tab_start_time(const base::TimeTicks& time) {
     new_tab_start_time_ = time;
   }
 
   // Notification that tab closing has started.  This can be called multiple
   // times, subsequent calls are ignored.
   void OnCloseStarted();
 
-  // Getter/Setters for the url request context to be used for this tab.
-  void set_request_context(URLRequestContextGetter* context);
-  URLRequestContextGetter* request_context() const {
-    return request_context_.get();
-  }
-
   LanguageState& language_state() {
     return language_state_;
   }
 
   // Returns true if underlying TabContentsView should accept drag-n-drop.
   bool ShouldAcceptDragAndDrop() const;
 
   // Creates a duplicate of this TabContents. The returned TabContents is
   // configured such that the renderer has not been loaded (it'll load the first
   // time it is selected).
@@ skipping 583 matching lines @@
   // If this tab was created from a renderer using window.open, this will be
   // non-NULL and represent the DOMUI of the opening renderer.
   DOMUITypeID opener_dom_ui_type_;
 
   // The time that we started to create the new tab page.
   base::TimeTicks new_tab_start_time_;
 
   // The time that we started to close the tab.
   base::TimeTicks tab_close_start_time_;
 
-  // Contextual information to be used for requests created here.
-  // Can be NULL in which case we defer to the request context from the
-  // profile
-  scoped_refptr<URLRequestContextGetter> request_context_;
-
   // Information about the language the page is in and has been translated to.
   LanguageState language_state_;
 
   // See description above setter.
   bool closed_by_user_gesture_;
 
   // See description in RenderViewHostDelegate::SetDisplayingPDFContent.
   bool displaying_pdf_content_;
 
   // ---------------------------------------------------------------------------
 
   DISALLOW_COPY_AND_ASSIGN(TabContents);
 };
 
 #endif  // CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_