Change LoadFailObserver to use WebContentsObserver::DidFinishNavigation notification.

chrome/test/base/in_process_browser_test_browsertest.cc

 // Copyright (c) 2011 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 <stddef.h>
 #include <string.h>
 
 #include "base/files/file_util.h"
 #include "base/macros.h"
 #include "base/path_service.h"
 #include "chrome/browser/after_startup_task_utils.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
+#include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "net/base/filename_util.h"
 #include "net/base/net_errors.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 class InProcessBrowserTestP
@@ skipping 10 matching lines @@
                         ::testing::Values("foo"));
 
 // WebContents observer that can detect provisional load failures.
 class LoadFailObserver : public content::WebContentsObserver {
  public:
   explicit LoadFailObserver(content::WebContents* contents)
       : content::WebContentsObserver(contents),
         failed_load_(false),
         error_code_(net::OK) { }
 
-  void DidFailProvisionalLoad(
-      content::RenderFrameHost* render_frame_host,
-      const GURL& validated_url,
-      int error_code,
-      const base::string16& error_description,
-      bool was_ignored_by_handler) override {
+  void DidFinishNavigation(
+      content::NavigationHandle* navigation_handle) override {
+    if (navigation_handle->GetNetErrorCode() == net::OK)
+      return;
+
     failed_load_ = true;
-    error_code_ = static_cast<net::Error>(error_code);
-    validated_url_ = validated_url;
+    error_code_ = navigation_handle->GetNetErrorCode();
+    validated_url_ = navigation_handle->GetURL();
   }
 
   bool failed_load() const { return failed_load_; }
   net::Error error_code() const { return error_code_; }
   const GURL& validated_url() const { return validated_url_; }
 
  private:
   bool failed_load_;
   net::Error error_code_;
   GURL validated_url_;
@@ skipping 79 matching lines @@
   ASSERT_TRUE(NavigateToURL(kFailHTML));
 
   std::string test_result;
   EXPECT_FALSE(RunAccessibilityChecks(&test_result));
 
   // Error should NOT be empty on failure.
   EXPECT_NE("", test_result);
 }
 
 }  // namespace