Fix incorrect SSL state being shown for client redirects.

chrome/browser/ssl/ssl_browser_tests.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 <utility>
 
 #include "base/base_switches.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
@@ skipping 3180 matching lines @@
     content::TestNavigationObserver observer(tab);
     tab->GetController().LoadURL(tab->GetLastCommittedURL(),
                                  content::Referrer(), ui::PAGE_TRANSITION_LINK,
                                  std::string());
     observer.Wait();
   }
 
   CheckAuthenticatedState(tab, AuthState::NONE);
 }
 
+// Checks that if a redirect occurs while the page is loading, the SSL state
+// reflects the final URL.
+IN_PROC_BROWSER_TEST_F(SSLUITest, ClientRedirectSSLState) {

[felt, 2016/09/07 00:03:29]

Can you add more variants of this test to trigger the corner cases we were
discussing?

* An in-page navigation
* Valid HTTPS -> HTTPS with mixed content
* HTTPS with mixed content -> valid HTTPS

[jam, 2016/09/07 01:50:49]

hmm this should have been covered by an existing test
(TestRunsInsecuredContentRandomizeHash) but that seems to not do anything now.
I've commented on https://codereview.chromium.org/1931063004/ and I'll add a new
test in the meantime.

this was also covered by the existing tests I broke in patchset 1, but I guess
better to have tests that check for this directly instead of as a side-effect.

Done
Done

+  ASSERT_TRUE(embedded_test_server()->Start());
+  ASSERT_TRUE(https_server_.Start());
+
+  GURL https_url = https_server_.GetURL("/ssl/redirect.html?");
+  GURL http_url = embedded_test_server()->GetURL("/ssl/google.html");
+
+  GURL url(https_url.spec() + http_url.spec());
+  ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(browser(), url, 2);
+  WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents();
+  CheckUnauthenticatedState(tab, AuthState::NONE);
+}
+
 // TODO(jcampan): more tests to do below.
 
 // Visit a page over https that contains a frame with a redirect.
 
 // XMLHttpRequest insecure content in synchronous mode.
 
 // XMLHttpRequest insecure content in asynchronous mode.
 
 // XMLHttpRequest over bad ssl in synchronous mode.
 
 // XMLHttpRequest over OK ssl in synchronous mode.