Perform redirect checks before OnReceivedRedirect in //net.

content/browser/frame_host/data_url_navigation_browsertest.cc

 // Copyright 2017 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 "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/macros.h"
 #include "base/path_service.h"
 #include "base/strings/pattern.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/scoped_feature_list.h"
 #include "build/build_config.h"
 #include "build/buildflag.h"
 #include "content/browser/site_per_process_browsertest.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/browser_side_navigation_policy.h"
 #include "content/public/common/content_features.h"
@@ skipping 931 matching lines @@
   EXPECT_TRUE(
       ExecuteScript(shell()->web_contents(),
                     "document.getElementById('window-open-redirect').click()"));
   Shell* new_shell = new_shell_observer.GetShell();
   NavigationController* controller =
       &new_shell->web_contents()->GetController();
   WaitForLoadStop(new_shell->web_contents());
 
   // The window.open() should have resulted in an error page. The blocked
   // URL should be in the virtual URL, not the actual URL.
+  //
+  // TODO(nasko): Now that the error commits on the previous URL, the blocked
+  // navigation logic is no longer needed.
   {
     EXPECT_EQ(0, controller->GetLastCommittedEntryIndex());
     NavigationEntry* entry = controller->GetLastCommittedEntry();
     EXPECT_EQ(PAGE_TYPE_ERROR, entry->GetPageType());
     EXPECT_FALSE(entry->GetURL().SchemeIs(url::kDataScheme));
-    EXPECT_TRUE(entry->GetVirtualURL().SchemeIs(url::kDataScheme));
+    EXPECT_TRUE(base::StartsWith(
+        entry->GetVirtualURL().spec(),
+        embedded_test_server()->GetURL("/server-redirect?").spec(),
+        base::CompareCase::SENSITIVE));
   }
 
   // Navigate forward and then go back to ensure the navigation to data: URL
   // is blocked. Use a browser-initiated back navigation, equivalent to user
   // pressing the back button.
   EXPECT_TRUE(
       NavigateToURL(new_shell, embedded_test_server()->GetURL("/title1.html")));
   EXPECT_EQ(1, controller->GetLastCommittedEntryIndex());
   {
     TestNavigationObserver observer(new_shell->web_contents());
     controller->GoBack();
     observer.Wait();
 
     NavigationEntry* entry = controller->GetLastCommittedEntry();
     EXPECT_EQ(0, controller->GetLastCommittedEntryIndex());
     EXPECT_FALSE(entry->GetURL().SchemeIs(url::kDataScheme));
-    EXPECT_TRUE(entry->GetVirtualURL().SchemeIs(url::kDataScheme));
+    EXPECT_TRUE(base::StartsWith(
+        entry->GetVirtualURL().spec(),
+        embedded_test_server()->GetURL("/server-redirect?").spec(),
+        base::CompareCase::SENSITIVE));
     EXPECT_EQ(url::kAboutBlankURL, entry->GetURL().spec());
   }
 
   // Do another new navigation, but then use JavaScript to navigate back,
   // equivalent to document executing JS.
   EXPECT_TRUE(
       NavigateToURL(new_shell, embedded_test_server()->GetURL("/title1.html")));
   EXPECT_EQ(1, controller->GetLastCommittedEntryIndex());
   {
     TestNavigationObserver observer(new_shell->web_contents());
     EXPECT_TRUE(ExecuteScript(new_shell, "history.go(-1)"));
     observer.Wait();
 
     NavigationEntry* entry = controller->GetLastCommittedEntry();
     EXPECT_EQ(0, controller->GetLastCommittedEntryIndex());
     EXPECT_FALSE(entry->GetURL().SchemeIs(url::kDataScheme));
-    EXPECT_TRUE(entry->GetVirtualURL().SchemeIs(url::kDataScheme));
+    EXPECT_TRUE(base::StartsWith(
+        entry->GetVirtualURL().spec(),
+        embedded_test_server()->GetURL("/server-redirect?").spec(),
+        base::CompareCase::SENSITIVE));
     EXPECT_EQ(url::kAboutBlankURL, entry->GetURL().spec());
   }
 }
 
 }  // content