When starting a provisional load include the parent frame ID in the IPC and pass it down the th WCO…

chrome/browser/captive_portal/captive_portal_tab_helper_unittest.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/captive_portal/captive_portal_tab_helper.h"
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/captive_portal/captive_portal_service.h"
 #include "chrome/browser/captive_portal/captive_portal_tab_reloader.h"
@@ skipping 71 matching lines @@
     web_contents2_.reset(NULL);
     web_contents1_.reset(NULL);
     TabContentsTestHarness::TearDown();
   }
 
   // Simulates a successful load of |url|.
   void SimulateSuccess(const GURL& url,
                        content::RenderViewHost* render_view_host) {
     EXPECT_CALL(mock_reloader(), OnLoadStart(url.SchemeIsSecure())).Times(1);
     tab_helper().DidStartProvisionalLoadForFrame(
-        1, true, url, false, render_view_host);
+        1, -1, true, url, false, render_view_host);
 
     EXPECT_CALL(mock_reloader(), OnLoadCommitted(net::OK)).Times(1);
     tab_helper().DidCommitProvisionalLoadForFrame(
         1, true, url, content::PAGE_TRANSITION_LINK, render_view_host);
   }
 
   // Simulates a connection timeout while requesting |url|.
   void SimulateTimeout(const GURL& url,
                        content::RenderViewHost* render_view_host) {
     EXPECT_CALL(mock_reloader(), OnLoadStart(url.SchemeIsSecure())).Times(1);
     tab_helper().DidStartProvisionalLoadForFrame(
-        1, true, url, false, render_view_host);
+        1, -1, true, url, false, render_view_host);
 
     tab_helper().DidFailProvisionalLoad(
         1, true, url, net::ERR_TIMED_OUT, string16(), render_view_host);
 
     // Provisional load starts for the error page.
     tab_helper().DidStartProvisionalLoadForFrame(
-        1, true, GURL(kErrorPageUrl), true, render_view_host);
+        1, -1, true, GURL(kErrorPageUrl), true, render_view_host);
 
     EXPECT_CALL(mock_reloader(), OnLoadCommitted(net::ERR_TIMED_OUT)).Times(1);
     tab_helper().DidCommitProvisionalLoadForFrame(
         1, true, GURL(kErrorPageUrl), content::PAGE_TRANSITION_LINK,
         render_view_host);
   }
 
   // Simulates an abort while requesting |url|.
   void SimulateAbort(const GURL& url,
                      content::RenderViewHost* render_view_host,
                      NavigationType navigation_type) {
     EXPECT_CALL(mock_reloader(), OnLoadStart(url.SchemeIsSecure())).Times(1);
     tab_helper().DidStartProvisionalLoadForFrame(
-        1, true, url, false, render_view_host);
+        1, -1, true, url, false, render_view_host);
 
     EXPECT_CALL(mock_reloader(), OnAbort()).Times(1);
     if (navigation_type == kSameProcess) {
       tab_helper().DidFailProvisionalLoad(
           1, true, url, net::ERR_ABORTED, string16(), render_view_host);
     } else {
       // For interrupted provisional cross-process navigations, the
       // RenderViewHost is destroyed without sending a DidFailProvisionalLoad
       // notification.
       tab_helper().Observe(
           content::NOTIFICATION_RENDER_VIEW_HOST_DELETED,
           content::Source<content::RenderViewHost>(render_view_host),
           content::NotificationService::NoDetails());
     }
 
     // Make sure that above call resulted in abort, for tests that continue
     // after the abort.
     EXPECT_CALL(mock_reloader(), OnAbort()).Times(0);
   }
 
   // Simulates an abort while loading an error page.
   void SimulateAbortTimeout(const GURL& url,
                             content::RenderViewHost* render_view_host,
                             NavigationType navigation_type) {
     EXPECT_CALL(mock_reloader(), OnLoadStart(url.SchemeIsSecure())).Times(1);
     tab_helper().DidStartProvisionalLoadForFrame(
-        1, true, url, false, render_view_host);
+        1, -1, true, url, false, render_view_host);
 
     tab_helper().DidFailProvisionalLoad(
         1, true, url, net::ERR_TIMED_OUT, string16(), render_view_host);
 
     // Start event for the error page.
     tab_helper().DidStartProvisionalLoadForFrame(
-        1, true, url, true, render_view_host);
+        1, -1, true, url, true, render_view_host);
 
     EXPECT_CALL(mock_reloader(), OnAbort()).Times(1);
     if (navigation_type == kSameProcess) {
       tab_helper().DidFailProvisionalLoad(
           1, true, url, net::ERR_ABORTED, string16(), render_view_host);
     } else {
       // For interrupted provisional cross-process navigations, the
       // RenderViewHost is destroyed without sending a DidFailProvisionalLoad
       // notification.
       tab_helper().Observe(
@@ skipping 73 matching lines @@
 
 // Same as above, but simulates what happens when the Link Doctor is enabled,
 // which adds another provisional load/commit for the error page, after the
 // first two.
 TEST_F(CaptivePortalTabHelperTest, HttpTimeoutLinkDoctor) {
   SimulateTimeout(GURL(kHttpUrl), render_view_host1());
 
   EXPECT_CALL(mock_reloader(), OnLoadStart(false)).Times(1);
   // Provisional load starts for the error page.
   tab_helper().DidStartProvisionalLoadForFrame(
-      1, true, GURL(kErrorPageUrl), true, render_view_host1());
+      1, -1, true, GURL(kErrorPageUrl), true, render_view_host1());
 
   EXPECT_CALL(mock_reloader(), OnLoadCommitted(net::OK)).Times(1);
   tab_helper().DidCommitProvisionalLoadForFrame(
       1, true, GURL(kErrorPageUrl), content::PAGE_TRANSITION_LINK,
       render_view_host1());
   tab_helper().DidStopLoading(render_view_host1());
 }
 
 TEST_F(CaptivePortalTabHelperTest, HttpsSuccess) {
   SimulateSuccess(GURL(kHttpsUrl), render_view_host1());
@@ skipping 53 matching lines @@
 // A provisional same-site navigation is interrupted by a cross-process
 // navigation without sending an abort first.
 TEST_F(CaptivePortalTabHelperTest, UnexpectedProvisionalLoad) {
   GURL same_site_url = GURL(kHttpUrl);
   GURL cross_process_url = GURL(kHttpsUrl2);
 
   // A same-site load for the original RenderViewHost starts.
   EXPECT_CALL(mock_reloader(),
               OnLoadStart(same_site_url.SchemeIsSecure())).Times(1);
   tab_helper().DidStartProvisionalLoadForFrame(
-      1, true, same_site_url, false, render_view_host1());
+      1, -1, true, same_site_url, false, render_view_host1());
 
   // It's unexpectedly interrupted by a cross-process navigation, which starts
   // navigating before the old navigation cancels.  We generate an abort message
   // for the old navigation.
   EXPECT_CALL(mock_reloader(), OnAbort()).Times(1);
   EXPECT_CALL(mock_reloader(),
               OnLoadStart(cross_process_url.SchemeIsSecure())).Times(1);
   tab_helper().DidStartProvisionalLoadForFrame(
-      1, true, cross_process_url, false, render_view_host2());
+      1, -1, true, cross_process_url, false, render_view_host2());
 
   // The cross-process navigation fails.
   tab_helper().DidFailProvisionalLoad(
       1, true, cross_process_url, net::ERR_FAILED, string16(),
       render_view_host2());
 
   // The same-site navigation finally is aborted.
   tab_helper().DidFailProvisionalLoad(
       1, true, same_site_url, net::ERR_ABORTED, string16(),
       render_view_host1());
 
   // The provisional load starts for the error page for the cross-process
   // navigation.
   tab_helper().DidStartProvisionalLoadForFrame(
-      1, true, GURL(kErrorPageUrl), true, render_view_host2());
+      1, -1, true, GURL(kErrorPageUrl), true, render_view_host2());
 
   EXPECT_CALL(mock_reloader(), OnLoadCommitted(net::ERR_FAILED)).Times(1);
   tab_helper().DidCommitProvisionalLoadForFrame(
       1, true, GURL(kErrorPageUrl), content::PAGE_TRANSITION_TYPED,
       render_view_host2());
 }
 
 // Similar to the above test, except the original RenderViewHost manages to
 // commit before its navigation is aborted.
 TEST_F(CaptivePortalTabHelperTest, UnexpectedCommit) {
   GURL same_site_url = GURL(kHttpUrl);
   GURL cross_process_url = GURL(kHttpsUrl2);
 
   // A same-site load for the original RenderViewHost starts.
   EXPECT_CALL(mock_reloader(),
               OnLoadStart(same_site_url.SchemeIsSecure())).Times(1);
   tab_helper().DidStartProvisionalLoadForFrame(
-      1, true, same_site_url, false, render_view_host1());
+      1, -1, true, same_site_url, false, render_view_host1());
 
   // It's unexpectedly interrupted by a cross-process navigation, which starts
   // navigating before the old navigation cancels.  We generate an abort message
   // for the old navigation.
   EXPECT_CALL(mock_reloader(), OnAbort()).Times(1);
   EXPECT_CALL(mock_reloader(),
               OnLoadStart(cross_process_url.SchemeIsSecure())).Times(1);
   tab_helper().DidStartProvisionalLoadForFrame(
-      1, true, cross_process_url, false, render_view_host2());
+      1, -1, true, cross_process_url, false, render_view_host2());
 
   // The cross-process navigation fails.
   tab_helper().DidFailProvisionalLoad(
       1, true, cross_process_url, net::ERR_FAILED, string16(),
       render_view_host2());
 
   // The same-site navigation succeeds.
   EXPECT_CALL(mock_reloader(), OnAbort()).Times(1);
   EXPECT_CALL(mock_reloader(),
               OnLoadStart(same_site_url.SchemeIsSecure())).Times(1);
   EXPECT_CALL(mock_reloader(), OnLoadCommitted(net::OK)).Times(1);
   tab_helper().DidCommitProvisionalLoadForFrame(
       1, true, same_site_url, content::PAGE_TRANSITION_LINK,
       render_view_host1());
 }
 
 // Simulates navigations for a number of subframes, and makes sure no
 // CaptivePortalTabHelper function is called.
 TEST_F(CaptivePortalTabHelperTest, HttpsSubframe) {
   GURL url = GURL(kHttpsUrl);
   // Normal load.
   tab_helper().DidStartProvisionalLoadForFrame(
-      1, false, url, false, render_view_host1());
+      1, -1, false, url, false, render_view_host1());
   tab_helper().DidCommitProvisionalLoadForFrame(
       1, false, url, content::PAGE_TRANSITION_LINK, render_view_host1());
 
   // Timeout.
   tab_helper().DidStartProvisionalLoadForFrame(
-      2, false, url, false, render_view_host1());
+      2, -1, false, url, false, render_view_host1());
   tab_helper().DidFailProvisionalLoad(
       2, false, url, net::ERR_TIMED_OUT, string16(), render_view_host1());
   tab_helper().DidStartProvisionalLoadForFrame(
-      2, false, url, true, render_view_host1());
+      2, -1, false, url, true, render_view_host1());
   tab_helper().DidFailProvisionalLoad(
       2, false, url, net::ERR_ABORTED, string16(), render_view_host1());
 
   // Abort.
   tab_helper().DidStartProvisionalLoadForFrame(
-      3, false, url, false, render_view_host1());
+      3, -1, false, url, false, render_view_host1());
   tab_helper().DidFailProvisionalLoad(
       3, false, url, net::ERR_ABORTED, string16(), render_view_host1());
 }
 
 // Simulates a subframe erroring out at the same time as a provisional load,
 // but with a different error code.  Make sure the TabHelper sees the correct
 // error.
 TEST_F(CaptivePortalTabHelperTest, HttpsSubframeParallelError) {
   // URL used by both frames.
   GURL url = GURL(kHttpsUrl);
 
   int frame_id = 2;
   int subframe_id = 1;
 
   // Loads start.
   EXPECT_CALL(mock_reloader(), OnLoadStart(url.SchemeIsSecure())).Times(1);
   tab_helper().DidStartProvisionalLoadForFrame(
-      frame_id, true, url, false, render_view_host1());
+      frame_id, -1, true, url, false, render_view_host1());
   tab_helper().DidStartProvisionalLoadForFrame(
-      subframe_id, false, url, false, render_view_host1());
+      subframe_id, frame_id, false, url, false, render_view_host1());
 
   // Loads return errors.
   tab_helper().DidFailProvisionalLoad(
       frame_id, true, url, net::ERR_UNEXPECTED, string16(),
       render_view_host1());
   tab_helper().DidFailProvisionalLoad(
       subframe_id, false, url, net::ERR_TIMED_OUT, string16(),
       render_view_host1());
 
   // Provisional load starts for the error pages.
   tab_helper().DidStartProvisionalLoadForFrame(
-      frame_id, true, url, true, render_view_host1());
+      frame_id, -1, true, url, true, render_view_host1());
   tab_helper().DidStartProvisionalLoadForFrame(
-      subframe_id, false, url, true, render_view_host1());
+      subframe_id, frame_id, false, url, true, render_view_host1());
 
   // Error page load finishes.
   tab_helper().DidCommitProvisionalLoadForFrame(
       subframe_id, false, url, content::PAGE_TRANSITION_AUTO_SUBFRAME,
       render_view_host1());
   EXPECT_CALL(mock_reloader(), OnLoadCommitted(net::ERR_UNEXPECTED)).Times(1);
   tab_helper().DidCommitProvisionalLoadForFrame(
       frame_id, true, url, content::PAGE_TRANSITION_LINK,
       render_view_host1());
 }
 
 // Simulates an HTTP to HTTPS redirect, which then times out.
 TEST_F(CaptivePortalTabHelperTest, HttpToHttpsRedirectTimeout) {
   GURL http_url(kHttpUrl);
   EXPECT_CALL(mock_reloader(), OnLoadStart(false)).Times(1);
   tab_helper().DidStartProvisionalLoadForFrame(
-      1, true, http_url, false, render_view_host1());
+      1, -1, true, http_url, false, render_view_host1());
 
   GURL https_url(kHttpsUrl);
   EXPECT_CALL(mock_reloader(), OnRedirect(true)).Times(1);
   OnRedirect(ResourceType::MAIN_FRAME, https_url,
              render_view_host1()->GetProcess()->GetID());
 
   tab_helper().DidFailProvisionalLoad(
       1, true, https_url, net::ERR_TIMED_OUT, string16(),
       render_view_host1());
 
   // Provisional load starts for the error page.
   tab_helper().DidStartProvisionalLoadForFrame(
-      1, true, GURL(kErrorPageUrl), true, render_view_host1());
+      1, -1, true, GURL(kErrorPageUrl), true, render_view_host1());
 
   EXPECT_CALL(mock_reloader(), OnLoadCommitted(net::ERR_TIMED_OUT)).Times(1);
   tab_helper().DidCommitProvisionalLoadForFrame(
       1, true, GURL(kErrorPageUrl), content::PAGE_TRANSITION_LINK,
       render_view_host1());
 }
 
 // Simulates an HTTPS to HTTP redirect.
 TEST_F(CaptivePortalTabHelperTest, HttpsToHttpRedirect) {
   GURL https_url(kHttpsUrl);
   EXPECT_CALL(mock_reloader(),
               OnLoadStart(https_url.SchemeIsSecure())).Times(1);
-  tab_helper().DidStartProvisionalLoadForFrame(1, true, https_url, false,
+  tab_helper().DidStartProvisionalLoadForFrame(1, -1, true, https_url, false,
                                                render_view_host1());
 
   GURL http_url(kHttpUrl);
   EXPECT_CALL(mock_reloader(), OnRedirect(http_url.SchemeIsSecure())).Times(1);
   OnRedirect(ResourceType::MAIN_FRAME, http_url,
              render_view_host1()->GetProcess()->GetID());
 
   EXPECT_CALL(mock_reloader(), OnLoadCommitted(net::OK)).Times(1);
   tab_helper().DidCommitProvisionalLoadForFrame(
       1, true, http_url, content::PAGE_TRANSITION_LINK,
       render_view_host1());
 }
 
 // Simulates an HTTPS to HTTPS redirect.
 TEST_F(CaptivePortalTabHelperTest, HttpToHttpRedirect) {
   GURL http_url(kHttpUrl);
   EXPECT_CALL(mock_reloader(),
               OnLoadStart(http_url.SchemeIsSecure())).Times(1);
   tab_helper().DidStartProvisionalLoadForFrame(
-      1, true, http_url, false, render_view_host1());
+      1, -1, true, http_url, false, render_view_host1());
 
   EXPECT_CALL(mock_reloader(), OnRedirect(http_url.SchemeIsSecure())).Times(1);
   OnRedirect(ResourceType::MAIN_FRAME, http_url,
              render_view_host1()->GetProcess()->GetID());
 
   EXPECT_CALL(mock_reloader(), OnLoadCommitted(net::OK)).Times(1);
   tab_helper().DidCommitProvisionalLoadForFrame(
       1, true, http_url, content::PAGE_TRANSITION_LINK,
       render_view_host1());
 }
 
 // Simulates redirect of a subframe.
 TEST_F(CaptivePortalTabHelperTest, SubframeRedirect) {
   GURL http_url(kHttpUrl);
   EXPECT_CALL(mock_reloader(), OnLoadStart(false)).Times(1);
   tab_helper().DidStartProvisionalLoadForFrame(
-      1, true, http_url, false, render_view_host1());
+      1, -1, true, http_url, false, render_view_host1());
 
   GURL https_url(kHttpsUrl);
   OnRedirect(ResourceType::SUB_FRAME, https_url,
              render_view_host1()->GetProcess()->GetID());
 
   EXPECT_CALL(mock_reloader(), OnLoadCommitted(net::OK)).Times(1);
   tab_helper().DidCommitProvisionalLoadForFrame(
       1, true, GURL(kErrorPageUrl), content::PAGE_TRANSITION_LINK,
       render_view_host1());
 }
 
 // Simulates a redirect, for another RenderViewHost.
 TEST_F(CaptivePortalTabHelperTest, OtherRenderViewHostRedirect) {
   GURL http_url(kHttpUrl);
   EXPECT_CALL(mock_reloader(), OnLoadStart(false)).Times(1);
   tab_helper().DidStartProvisionalLoadForFrame(
-      1, true, http_url, false, render_view_host1());
+      1, -1, true, http_url, false, render_view_host1());
 
   // Another RenderViewHost sees a redirect.  None of the reloader's functions
   // should be called.
   GURL https_url(kHttpsUrl);
   OnRedirect(ResourceType::MAIN_FRAME, https_url,
              render_view_host2()->GetProcess()->GetID());
 
   tab_helper().DidFailProvisionalLoad(
       1, true, https_url, net::ERR_TIMED_OUT, string16(),
       render_view_host1());
 
   // Provisional load starts for the error page.
   tab_helper().DidStartProvisionalLoadForFrame(
-      1, true, GURL(kErrorPageUrl), true, render_view_host1());
+      1, -1, true, GURL(kErrorPageUrl), true, render_view_host1());
 
   EXPECT_CALL(mock_reloader(), OnLoadCommitted(net::ERR_TIMED_OUT)).Times(1);
   tab_helper().DidCommitProvisionalLoadForFrame(
       1, true, GURL(kErrorPageUrl), content::PAGE_TRANSITION_LINK,
       render_view_host1());
 }
 
 TEST_F(CaptivePortalTabHelperTest, LoginTabLogin) {
   EXPECT_FALSE(tab_helper().IsLoginTab());
   SetIsLoginTab();
@@ skipping 37 matching lines @@
   EXPECT_FALSE(tab_helper().IsLoginTab());
 
   ObservePortalResult(RESULT_BEHIND_CAPTIVE_PORTAL, RESULT_NO_RESPONSE);
   EXPECT_FALSE(tab_helper().IsLoginTab());
 
   ObservePortalResult(RESULT_NO_RESPONSE, RESULT_INTERNET_CONNECTED);
   EXPECT_FALSE(tab_helper().IsLoginTab());
 }
 
 }  // namespace captive_portal