summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-05 11:50:20 +0000
committercbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-05 11:50:20 +0000
commitcbf720c5300f425f9436e0cb8678511f213dd5c4 (patch)
tree7bf244adea678b92ddd25fd9d15ca59ff3724c6c
parent1780c2e73f5fc696be5269f5b5ecbd373a9fad3c (diff)
downloadchromium_src-cbf720c5300f425f9436e0cb8678511f213dd5c4.zip
chromium_src-cbf720c5300f425f9436e0cb8678511f213dd5c4.tar.gz
chromium_src-cbf720c5300f425f9436e0cb8678511f213dd5c4.tar.bz2
Fix PrerenderBrowserTest.PrerenderHttpAuthentication for TabContents-based-prerender.
BUG=81427 TEST=browser_tests --gtest_filter=*PrerenderHttpAuthentication* Review URL: http://codereview.chromium.org/6909030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84232 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/prerender/prerender_contents.cc8
1 files changed, 3 insertions, 5 deletions
diff --git a/chrome/browser/prerender/prerender_contents.cc b/chrome/browser/prerender/prerender_contents.cc
index f6b7d5e..20e5fb02 100644
--- a/chrome/browser/prerender/prerender_contents.cc
+++ b/chrome/browser/prerender/prerender_contents.cc
@@ -435,16 +435,14 @@ void PrerenderContents::Observe(NotificationType type,
case NotificationType::AUTH_NEEDED:
case NotificationType::AUTH_CANCELLED: {
- // Prerendered pages have a NULL controller and the login handler should
- // be referencing us as the RenderViewHost delegate.
- NavigationController* controller =
- Source<NavigationController>(source).ptr();
+ // Only respond to HTTP authentication notifications which
+ // are required for this prerendered page.
LoginNotificationDetails* details_ptr =
Details<LoginNotificationDetails>(details).ptr();
LoginHandler* handler = details_ptr->handler();
DCHECK(handler != NULL);
RenderViewHostDelegate* delegate = handler->GetRenderViewHostDelegate();
- if (controller == NULL && delegate == GetRenderViewHostDelegate()) {
+ if (delegate == GetRenderViewHostDelegate()) {
Destroy(FINAL_STATUS_AUTH_NEEDED);
return;
}