Remove use of deprecated APIs in WebNavigationApiTest

chrome/browser/extensions/api/web_navigation/web_navigation_apitest.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 <list>
 #include <set>
 
 #include "base/files/scoped_temp_dir.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
@@ skipping 14 matching lines @@
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_context_menu/render_view_context_menu_test_util.h"
 #include "chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_navigator_params.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/resource_controller.h"
 #include "content/public/browser/resource_dispatcher_host.h"
 #include "content/public/browser/resource_throttle.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/context_menu_params.h"
 #include "content/public/common/resource_type.h"
@@ skipping 136 matching lines @@
       const GURL& delay_url,
       const std::string& script,
       const std::string& until_url_suffix)
       : content::WebContentsObserver(),
         test_navigation_listener_(test_navigation_listener),
         delay_url_(delay_url),
         until_url_suffix_(until_url_suffix),
         script_(script),
         has_user_gesture_(false),
         script_was_executed_(false),
-        rvh_(NULL) {
+        rfh_(NULL) {

[nasko, 2016/08/25 01:05:09]

nit: nullptr

[clamy, 2016/08/25 18:09:26]

Done.

     registrar_.Add(this,
                    chrome::NOTIFICATION_TAB_ADDED,
                    content::NotificationService::AllSources());
     test_navigation_listener_->DelayRequestsForURL(delay_url_);
   }
   ~DelayLoadStartAndExecuteJavascript() override {}
 
   void Observe(int type,
                const content::NotificationSource& source,
                const content::NotificationDetails& details) override {
     if (type != chrome::NOTIFICATION_TAB_ADDED) {
       NOTREACHED();
       return;
     }
     content::WebContentsObserver::Observe(
         content::Details<content::WebContents>(details).ptr());
     registrar_.RemoveAll();
   }
 
-  void DidStartProvisionalLoadForFrame(
-      content::RenderFrameHost* render_frame_host,
-      const GURL& validated_url,
-      bool is_error_page,
-      bool is_iframe_srcdoc) override {
-    if (validated_url != delay_url_ || !rvh_)
+  void DidStartNavigation(
+      content::NavigationHandle* navigation_handle) override {
+    if (navigation_handle->GetURL() != delay_url_ || !rfh_)
       return;
 
     if (has_user_gesture_) {
-      rvh_->GetMainFrame()->ExecuteJavaScriptWithUserGestureForTests(
+      rfh_->ExecuteJavaScriptWithUserGestureForTests(
           base::UTF8ToUTF16(script_));
     } else {
-      rvh_->GetMainFrame()->ExecuteJavaScriptForTests(
-          base::UTF8ToUTF16(script_));
+      rfh_->ExecuteJavaScriptForTests(base::UTF8ToUTF16(script_));
     }
     script_was_executed_ = true;
   }
 
-  void DidCommitProvisionalLoadForFrame(
-      content::RenderFrameHost* render_frame_host,
-      const GURL& url,
-      ui::PageTransition transition_type) override {
+  void DidFinishNavigation(
+      content::NavigationHandle* navigation_handle) override {
+    if (!navigation_handle->HasCommitted())

[nasko, 2016/08/25 01:05:09]

Should this also check if the commit was an error page?

[clamy, 2016/08/25 18:09:26]

Done.

+      return;
+
     if (script_was_executed_ &&
-        base::EndsWith(url.spec(), until_url_suffix_,
+        base::EndsWith(navigation_handle->GetURL().spec(), until_url_suffix_,
                        base::CompareCase::SENSITIVE)) {
       content::WebContentsObserver::Observe(NULL);
       test_navigation_listener_->ResumeAll();
     }
-    rvh_ = render_frame_host->GetRenderViewHost();
+
+    if (navigation_handle->IsInMainFrame())
+      rfh_ = navigation_handle->GetRenderFrameHost();
   }
 
   void set_has_user_gesture(bool has_user_gesture) {
     has_user_gesture_ = has_user_gesture;
   }
 
  private:
   content::NotificationRegistrar registrar_;
 
   scoped_refptr<TestNavigationListener> test_navigation_listener_;
 
   GURL delay_url_;
   std::string until_url_suffix_;
   std::string script_;
   bool has_user_gesture_;
   bool script_was_executed_;
-  content::RenderViewHost* rvh_;
+  content::RenderFrameHost* rfh_;
 
   DISALLOW_COPY_AND_ASSIGN(DelayLoadStartAndExecuteJavascript);
 };
 
 class StartProvisionalLoadObserver : public content::WebContentsObserver {
  public:
   StartProvisionalLoadObserver(WebContents* web_contents,
                                const GURL& expected_url)
       : content::WebContentsObserver(web_contents),
         url_(expected_url),
@@ skipping 523 matching lines @@
           "extensions/api_test/webnavigation/crash/b.html",
       embedded_test_server()->port()));
   ui_test_utils::NavigateToURL(browser(), url);
 
   ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 #endif
 
 }  // namespace extensions