summaryrefslogtreecommitdiffstats
path: root/chrome/browser/tab_contents/interstitial_page.cc
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-04 04:02:51 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-04 04:02:51 +0000
commit674b382acde1e6f5f8919fff715388a37afcedee (patch)
tree4e4cad713a552a6f58a2e2ad6ef2688203c025f6 /chrome/browser/tab_contents/interstitial_page.cc
parent71a77a6260e63813d6ab0909f8cba1266863d9ca (diff)
downloadchromium_src-674b382acde1e6f5f8919fff715388a37afcedee.zip
chromium_src-674b382acde1e6f5f8919fff715388a37afcedee.tar.gz
chromium_src-674b382acde1e6f5f8919fff715388a37afcedee.tar.bz2
ChromeFrame currently overrides the request context for intercepting network requests and cookie requests to route them
over the automation channel. This adds needless complexity and race conditions between registering a request context for a renderer process as the first one wins. We no longer override the request context in ChromeFrame. For cookie requests we look up the registered render view map and on finding one we route the request over the automation channel. Fixes bug http://code.google.com/p/chromium/issues/detail?id=51103 Bug=51103 Review URL: http://codereview.chromium.org/3036038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54867 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents/interstitial_page.cc')
-rw-r--r--chrome/browser/tab_contents/interstitial_page.cc7
1 files changed, 1 insertions, 6 deletions
diff --git a/chrome/browser/tab_contents/interstitial_page.cc b/chrome/browser/tab_contents/interstitial_page.cc
index 10c8d7c..3d09052 100644
--- a/chrome/browser/tab_contents/interstitial_page.cc
+++ b/chrome/browser/tab_contents/interstitial_page.cc
@@ -404,12 +404,7 @@ TabContentsView* InterstitialPage::CreateTabContentsView() {
render_view_host_->set_view(view);
render_view_host_->AllowBindings(BindingsPolicy::DOM_AUTOMATION);
- scoped_refptr<URLRequestContextGetter> request_context =
- tab()->request_context();
- if (!request_context.get())
- request_context = tab()->profile()->GetRequestContext();
-
- render_view_host_->CreateRenderView(request_context.get(), string16());
+ render_view_host_->CreateRenderView(string16());
view->SetSize(tab_contents_view->GetContainerSize());
// Don't show the interstitial until we have navigated to it.
view->Hide();