Perform redirect checks before OnReceivedRedirect in //net.

content/browser/browser_side_navigation_browsertest.cc

 // Copyright 2014 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 <stdint.h>
 
 #include "base/command_line.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/scoped_feature_list.h"
@@ skipping 402 matching lines @@
   EXPECT_FALSE(NavigateToURL(shell(), redirect_to_blank_url));
   EXPECT_EQ(1, controller.GetLastCommittedEntryIndex());
   EXPECT_EQ(PAGE_TYPE_ERROR, controller.GetLastCommittedEntry()->GetPageType());
 
   TestNavigationObserver reload_observer(shell()->web_contents());
   EXPECT_TRUE(ExecuteScript(shell(), "location.reload()"));
   reload_observer.Wait();
 
   // The expectation is that about:blank was loaded and the virtual URL is set
   // to the URL that was blocked.
+  //
+  // TODO(nasko): Now that the error commits on the previous URL, the blocked
+  // navigation logic is no longer needed.

[nasko, 2017/06/06 00:27:38]

Can you add "See https://crbug.com/723796." so these can be easily tracked?

[davidben, 2017/06/06 17:31:08]

Done.

   EXPECT_EQ(1, controller.GetLastCommittedEntryIndex());
   EXPECT_FALSE(
       controller.GetLastCommittedEntry()->GetURL().SchemeIs(url::kDataScheme));
-  EXPECT_TRUE(controller.GetLastCommittedEntry()->GetVirtualURL().SchemeIs(
-      url::kDataScheme));
+  EXPECT_EQ(redirect_to_blank_url,
+            controller.GetLastCommittedEntry()->GetVirtualURL());
   EXPECT_EQ(url::kAboutBlankURL,
             controller.GetLastCommittedEntry()->GetURL().spec());
 }
 
 class BrowserSideNavigationBrowserDisableWebSecurityTest
     : public BrowserSideNavigationBrowserTest {
  public:
   BrowserSideNavigationBrowserDisableWebSecurityTest() {}
 
  protected:
@@ skipping 71 matching lines @@
       "xhr.send();\n"
       "window.domAutomationController.send(xhr.responseText);",
       file_url.spec().c_str());
   std::string result;
   EXPECT_TRUE(
       ExecuteScriptAndExtractString(shell()->web_contents(), script, &result));
   EXPECT_TRUE(result.empty());
 }
 
 }  // namespace content