Convert CrossSiteRedirectorBrowserTest to use the new navigation callbacks.

content/test/browser_test_utils_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 "base/macros.h"
 #include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/resource_request_details.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/content_browser_test.h"
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/shell/browser/shell.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 
 namespace content {
 
 class NavigationObserver: public WebContentsObserver {
  public:
   explicit NavigationObserver(WebContents* web_contents)
       : WebContentsObserver(web_contents) {}
   ~NavigationObserver() override {}
 
-  void DidCommitProvisionalLoadForFrame(
-      RenderFrameHost* render_frame_host,
-      const GURL& url,
-      ui::PageTransition transition_type) override {
-    navigation_url_ = url;
+  void DidFinishNavigation(NavigationHandle* navigation_handle) override {
+    if (navigation_handle->HasCommitted())

[nasko, 2017/01/27 00:25:07]

Should we use the same approach as the other CL to check it isn't an error?

[jam, 2017/01/27 00:37:08]

since
1) it doesn't matter in this case since it's a test, and it's still passing
2) the old callback would get called for the error url and it wasn't checking
that
I left it out

+      navigation_url_ = navigation_handle->GetURL();
   }
 
   void DidRedirectNavigation(NavigationHandle* handle) override {
     redirect_url_ = handle->GetURL();
   }
 
   const GURL& navigation_url() const {
     return navigation_url_;
   }
 
@@ skipping 34 matching lines @@
   GURL::Replacements replace_host;
   GURL expected_url(embedded_test_server()->GetURL("/title2.html"));
   replace_host.SetHostStr("foo.com");
   expected_url = expected_url.ReplaceComponents(replace_host);
 
   EXPECT_EQ(expected_url, observer.navigation_url());
   EXPECT_EQ(observer.redirect_url(), observer.navigation_url());
 }
 
 }  // namespace content