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

chrome/browser/external_tab_container_win.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_EXTERNAL_TAB_CONTAINER_WIN_H_
 #define CHROME_BROWSER_EXTERNAL_TAB_CONTAINER_WIN_H_
 
 #include <vector>
 #include <map>
 #include "base/lazy_instance.h"
 #include "chrome/browser/automation/automation_resource_message_filter.h"
-#include "chrome/browser/automation/automation_profile_impl.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #include "chrome/browser/views/frame/browser_bubble_host.h"
 #include "chrome/browser/views/infobars/infobar_container.h"
 #include "chrome/browser/views/unhandled_keyboard_event_handler.h"
 #include "chrome/common/navigation_types.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "views/accelerator.h"
@@ skipping 190 matching lines @@
   // Overridden from views::WidgetWin:
   virtual LRESULT OnCreate(LPCREATESTRUCT create_struct);
   virtual void OnDestroy();
   virtual void OnFinalMessage(HWND window);
 
   bool InitNavigationInfo(IPC::NavigationInfo* nav_info,
                           NavigationType::Type nav_type,
                           int relative_offset);
   void Navigate(const GURL& url, const GURL& referrer);
 
-  // Initializes the request context to be used for automation HTTP requests.
-  void InitializeAutomationRequestContext(int tab_handle);
-
  private:
   friend class base::RefCounted<ExternalTabContainer>;
 
   ~ExternalTabContainer();
 
   // Helper resource automation registration method, allowing registration of
   // pending RenderViewHosts.
   void RegisterRenderViewHostForAutomation(RenderViewHost* render_view_host,
                                            bool pending_view);
 
@@ skipping 95 matching lines @@
 
   views::View* external_tab_view_;
 
   gfx::NativeWindow notification_window_;
   int notification_message_;
 
   DISALLOW_COPY_AND_ASSIGN(ExternalTabContainer);
 };
 
 #endif  // CHROME_BROWSER_EXTERNAL_TAB_CONTAINER_WIN_H_