Remove RenderViewHost parameter from WebContentsObserver::Did{Start|Stop}Loading.

This parameter is unused in almost every class derived from WebContentsObserver.
This will make refactoring the OnDid{Start|Stop}Loading IPCs from
WebContentsImpl to RenderFrameHostImpl simpler.

BUG=429399,450799

Review URL: https://codereview.chromium.org/1008913002

Cr-Commit-Position: refs/heads/master@{#321341}

51 files changed, 90 insertions, 122 deletions

diff --git a/chrome/browser/background/background_contents.cc b/chrome/browser/background/background_contents.cc
index 4f65a13..f17f863 100644
--- a/chrome/browser/background/background_contents.cc
+++ b/chrome/browser/background/background_contents.cc
@@ -162,8 +162,7 @@ void BackgroundContents::RenderProcessGone(base::TerminationStatus status) {
   delete this;
 }
 
-void BackgroundContents::DidStartLoading(
-    content::RenderViewHost* render_view_host) {
+void BackgroundContents::DidStartLoading() {
   // BackgroundContents only loads once, so this can only be the first time it
   // has started loading.
   FOR_EACH_OBSERVER(extensions::DeferredStartRenderHostObserver,
@@ -171,8 +170,7 @@ void BackgroundContents::DidStartLoading(
                     OnDeferredStartRenderHostDidStartFirstLoad(this));
 }
 
-void BackgroundContents::DidStopLoading(
-    content::RenderViewHost* render_view_host) {
+void BackgroundContents::DidStopLoading() {
   // BackgroundContents only loads once, so this can only be the first time
   // it has stopped loading.
   FOR_EACH_OBSERVER(extensions::DeferredStartRenderHostObserver,
diff --git a/chrome/browser/background/background_contents.h b/chrome/browser/background/background_contents.h
index e3a0775..9d8dbbc 100644
--- a/chrome/browser/background/background_contents.h
+++ b/chrome/browser/background/background_contents.h
@@ -81,8 +81,8 @@ class BackgroundContents : public extensions::DeferredStartRenderHost,
 
   // content::WebContentsObserver implementation:
   void RenderProcessGone(base::TerminationStatus status) override;
-  void DidStartLoading(content::RenderViewHost* render_view_host) override;
-  void DidStopLoading(content::RenderViewHost* render_view_host) override;
+  void DidStartLoading() override;
+  void DidStopLoading() override;
 
   // content::NotificationObserver
   void Observe(int type,
diff --git a/chrome/browser/captive_portal/captive_portal_tab_helper.cc b/chrome/browser/captive_portal/captive_portal_tab_helper.cc
index ec60bea..a8479f7 100644
--- a/chrome/browser/captive_portal/captive_portal_tab_helper.cc
+++ b/chrome/browser/captive_portal/captive_portal_tab_helper.cc
@@ -146,8 +146,7 @@ void CaptivePortalTabHelper::DidFailProvisionalLoad(
   pending_error_code_ = error_code;
 }
 
-void CaptivePortalTabHelper::DidStopLoading(
-    content::RenderViewHost* render_view_host) {
+void CaptivePortalTabHelper::DidStopLoading() {
   DCHECK(CalledOnValidThread());
 
   login_detector_->OnStoppedLoading();
diff --git a/chrome/browser/captive_portal/captive_portal_tab_helper.h b/chrome/browser/captive_portal/captive_portal_tab_helper.h
index 9938432..815ccb4 100644
--- a/chrome/browser/captive_portal/captive_portal_tab_helper.h
+++ b/chrome/browser/captive_portal/captive_portal_tab_helper.h
@@ -81,7 +81,7 @@ class CaptivePortalTabHelper
                               int error_code,
                               const base::string16& error_description) override;
 
-  void DidStopLoading(content::RenderViewHost* render_view_host) override;
+  void DidStopLoading() override;
 
   // content::NotificationObserver:
   void Observe(int type,
diff --git a/chrome/browser/captive_portal/captive_portal_tab_helper_unittest.cc b/chrome/browser/captive_portal/captive_portal_tab_helper_unittest.cc
index 962ba28..cbdf991 100644
--- a/chrome/browser/captive_portal/captive_portal_tab_helper_unittest.cc
+++ b/chrome/browser/captive_portal/captive_portal_tab_helper_unittest.cc
@@ -245,12 +245,12 @@ class CaptivePortalTabHelperTest : public ChromeRenderViewHostTestHarness {
 
 TEST_F(CaptivePortalTabHelperTest, HttpSuccess) {
   SimulateSuccess(GURL(kHttpUrl), render_view_host1());
-  tab_helper().DidStopLoading(render_view_host1());
+  tab_helper().DidStopLoading();
 }
 
 TEST_F(CaptivePortalTabHelperTest, HttpTimeout) {
   SimulateTimeout(GURL(kHttpUrl), render_view_host1());
-  tab_helper().DidStopLoading(render_view_host1());
+  tab_helper().DidStopLoading();
 }
 
 // Same as above, but simulates what happens when the Link Doctor is enabled,
@@ -268,12 +268,12 @@ TEST_F(CaptivePortalTabHelperTest, HttpTimeoutLinkDoctor) {
   tab_helper().DidCommitProvisionalLoadForFrame(main_render_frame1(),
                                                 GURL(kErrorPageUrl),
                                                 ui::PAGE_TRANSITION_LINK);
-  tab_helper().DidStopLoading(render_view_host1());
+  tab_helper().DidStopLoading();
 }
 
 TEST_F(CaptivePortalTabHelperTest, HttpsSuccess) {
   SimulateSuccess(GURL(kHttpsUrl), render_view_host1());
-  tab_helper().DidStopLoading(render_view_host1());
+  tab_helper().DidStopLoading();
   EXPECT_FALSE(tab_helper().IsLoginTab());
 }
 
diff --git a/chrome/browser/extensions/api/identity/web_auth_flow.cc b/chrome/browser/extensions/api/identity/web_auth_flow.cc
index 4c7d9fa..a1573a0 100644
--- a/chrome/browser/extensions/api/identity/web_auth_flow.cc
+++ b/chrome/browser/extensions/api/identity/web_auth_flow.cc
@@ -231,7 +231,7 @@ void WebAuthFlow::DidFailProvisionalLoad(
     delegate_->OnAuthFlowFailure(LOAD_FAILED);
 }
 
-void WebAuthFlow::DidStopLoading(RenderViewHost* render_view_host) {
+void WebAuthFlow::DidStopLoading() {
   AfterUrlLoaded();
 }
 
diff --git a/chrome/browser/extensions/api/identity/web_auth_flow.h b/chrome/browser/extensions/api/identity/web_auth_flow.h
index cc3ac2a..81fbd53 100644
--- a/chrome/browser/extensions/api/identity/web_auth_flow.h
+++ b/chrome/browser/extensions/api/identity/web_auth_flow.h
@@ -101,7 +101,7 @@ class WebAuthFlow : public content::NotificationObserver,
                const content::NotificationDetails& details) override;
 
   // WebContentsObserver implementation.
-  void DidStopLoading(content::RenderViewHost* render_view_host) override;
+  void DidStopLoading() override;
   void DidNavigateMainFrame(
       const content::LoadCommittedDetails& details,
       const content::FrameNavigateParams& params) override;
diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc
index 2fb6530..45f4292 100644
--- a/chrome/browser/policy/policy_browsertest.cc
+++ b/chrome/browser/policy/policy_browsertest.cc
@@ -525,7 +525,7 @@ class WebContentsLoadedOrDestroyedWatcher
 
   // Overridden WebContentsObserver methods.
   void WebContentsDestroyed() override;
-  void DidStopLoading(content::RenderViewHost* render_view_host) override;
+  void DidStopLoading() override;
 
  private:
   scoped_refptr<content::MessageLoopRunner> message_loop_runner_;
@@ -549,8 +549,7 @@ void WebContentsLoadedOrDestroyedWatcher::WebContentsDestroyed() {
   message_loop_runner_->Quit();
 }
 
-void WebContentsLoadedOrDestroyedWatcher::DidStopLoading(
-    content::RenderViewHost* render_view_host) {
+void WebContentsLoadedOrDestroyedWatcher::DidStopLoading() {
   message_loop_runner_->Quit();
 }
 
diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc
index 290fb23..0d3a861 100644
--- a/chrome/browser/prerender/prerender_browsertest.cc
+++ b/chrome/browser/prerender/prerender_browsertest.cc
@@ -311,10 +311,8 @@ class NavigationOrSwapObserver : public WebContentsObserver,
   }
 
   // WebContentsObserver implementation:
-  void DidStartLoading(RenderViewHost* render_view_host) override {
-    did_start_loading_ = true;
-  }
-  void DidStopLoading(RenderViewHost* render_view_host) override {
+  void DidStartLoading() override { did_start_loading_ = true; }
+  void DidStopLoading() override {
     if (!did_start_loading_)
       return;
     number_of_loads_--;
diff --git a/chrome/browser/prerender/prerender_contents.cc b/chrome/browser/prerender/prerender_contents.cc
index 4795fa6..2ea6a66 100644
--- a/chrome/browser/prerender/prerender_contents.cc
+++ b/chrome/browser/prerender/prerender_contents.cc
@@ -545,8 +545,7 @@ void PrerenderContents::RenderFrameCreated(
       render_frame_host->GetRoutingID(), true));
 }
 
-void PrerenderContents::DidStopLoading(
-    content::RenderViewHost* render_view_host) {
+void PrerenderContents::DidStopLoading() {
   has_stopped_loading_ = true;
   NotifyPrerenderStopLoading();
 }
diff --git a/chrome/browser/prerender/prerender_contents.h b/chrome/browser/prerender/prerender_contents.h
index a5ea93d..b31f7e7 100644
--- a/chrome/browser/prerender/prerender_contents.h
+++ b/chrome/browser/prerender/prerender_contents.h
@@ -195,7 +195,7 @@ class PrerenderContents : public content::NotificationObserver,
 
   // content::WebContentsObserver implementation.
   void RenderFrameCreated(content::RenderFrameHost* render_frame_host) override;
-  void DidStopLoading(content::RenderViewHost* render_view_host) override;
+  void DidStopLoading() override;
   void DocumentLoadedInFrame(
       content::RenderFrameHost* render_frame_host) override;
   void DidStartProvisionalLoadForFrame(
diff --git a/chrome/browser/prerender/prerender_tab_helper.cc b/chrome/browser/prerender/prerender_tab_helper.cc
index 33017f7..1d51f92 100644
--- a/chrome/browser/prerender/prerender_tab_helper.cc
+++ b/chrome/browser/prerender/prerender_tab_helper.cc
@@ -100,8 +100,7 @@ void PrerenderTabHelper::DidCommitProvisionalLoadForFrame(
                                          web_contents());
 }
 
-void PrerenderTabHelper::DidStopLoading(
-    content::RenderViewHost* render_view_host) {
+void PrerenderTabHelper::DidStopLoading() {
   // Compute the PPLT metric and report it in a histogram, if needed. If the
   // page is still prerendering, record the not swapped in page load time
   // instead.
diff --git a/chrome/browser/prerender/prerender_tab_helper.h b/chrome/browser/prerender/prerender_tab_helper.h
index 4008071..9bb464a 100644
--- a/chrome/browser/prerender/prerender_tab_helper.h
+++ b/chrome/browser/prerender/prerender_tab_helper.h
@@ -50,7 +50,7 @@ class PrerenderTabHelper
   void DidGetRedirectForResourceRequest(
       content::RenderFrameHost* render_frame_host,
       const content::ResourceRedirectDetails& details) override;
-  void DidStopLoading(content::RenderViewHost* render_view_host) override;
+  void DidStopLoading() override;
   void DidStartProvisionalLoadForFrame(
       content::RenderFrameHost* render_frame_host,
       const GURL& validated_url,
diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc
index efa7b1a..a13e643 100644
--- a/chrome/browser/printing/print_view_manager_base.cc
+++ b/chrome/browser/printing/print_view_manager_base.cc
@@ -202,8 +202,7 @@ void PrintViewManagerBase::OnShowInvalidPrinterSettingsError() {
                          chrome::MESSAGE_BOX_TYPE_WARNING);
 }
 
-void PrintViewManagerBase::DidStartLoading(
-    content::RenderViewHost* render_view_host) {
+void PrintViewManagerBase::DidStartLoading() {
   UpdateScriptedPrintingBlocked();
 }
 
diff --git a/chrome/browser/printing/print_view_manager_base.h b/chrome/browser/printing/print_view_manager_base.h
index c580013..6c202e5 100644
--- a/chrome/browser/printing/print_view_manager_base.h
+++ b/chrome/browser/printing/print_view_manager_base.h
@@ -70,7 +70,7 @@ class PrintViewManagerBase : public content::NotificationObserver,
                const content::NotificationDetails& details) override;
 
   // content::WebContentsObserver implementation.
-  void DidStartLoading(content::RenderViewHost* render_view_host) override;
+  void DidStartLoading() override;
 
   // Cancels the print job.
   void NavigationStopped() override;
diff --git a/chrome/browser/safe_browsing/client_side_detection_host.cc b/chrome/browser/safe_browsing/client_side_detection_host.cc
index 9484b83..3e49730 100644
--- a/chrome/browser/safe_browsing/client_side_detection_host.cc
+++ b/chrome/browser/safe_browsing/client_side_detection_host.cc
@@ -510,7 +510,7 @@ void ClientSideDetectionHost::OnMalwarePreClassificationDone(
   MaybeStartMalwareFeatureExtraction();
 }
 
-void ClientSideDetectionHost::DidStopLoading(content::RenderViewHost* rvh) {
+void ClientSideDetectionHost::DidStopLoading() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (!csd_service_ || !browse_info_.get())
     return;
diff --git a/chrome/browser/safe_browsing/client_side_detection_host.h b/chrome/browser/safe_browsing/client_side_detection_host.h
index 2384e35..80adafe 100644
--- a/chrome/browser/safe_browsing/client_side_detection_host.h
+++ b/chrome/browser/safe_browsing/client_side_detection_host.h
@@ -128,7 +128,7 @@ class ClientSideDetectionHost : public content::WebContentsObserver,
 
   // Inherited from WebContentsObserver.  This is called once the page is
   // done loading.
-  void DidStopLoading(content::RenderViewHost* rvh) override;
+  void DidStopLoading() override;
 
   // Returns true if the user has seen a regular SafeBrowsing
   // interstitial for the current page.  This is only true if the user has
diff --git a/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc b/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc
index 9fd2f7d..d6f20d6 100644
--- a/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc
+++ b/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc
@@ -245,9 +245,7 @@ class ClientSideDetectionHostTest : public ChromeRenderViewHostTestHarness {
     csd_host_->OnPhishingDetectionDone(verdict_str);
   }
 
-  void DidStopLoading() {
-    csd_host_->DidStopLoading(pending_rvh());
-  }
+  void DidStopLoading() { csd_host_->DidStopLoading(); }
 
   void UpdateIPUrlMap(const std::string& ip, const std::string& host) {
     csd_host_->UpdateIPUrlMap(ip, host, "", "", content::RESOURCE_TYPE_OBJECT);
diff --git a/chrome/browser/tab_contents/navigation_metrics_recorder.cc b/chrome/browser/tab_contents/navigation_metrics_recorder.cc
index 5e9149f..1be27f0 100644
--- a/chrome/browser/tab_contents/navigation_metrics_recorder.cc
+++ b/chrome/browser/tab_contents/navigation_metrics_recorder.cc
@@ -33,11 +33,12 @@ void NavigationMetricsRecorder::DidNavigateMainFrame(
                                                 details.is_in_page);
 }
 
-void NavigationMetricsRecorder::DidStartLoading(
-    content::RenderViewHost* render_view_host) {
+void NavigationMetricsRecorder::DidStartLoading() {
 #if defined(OS_WIN) && defined(USE_ASH)
-  if (render_view_host && base::win::GetVersion() >= base::win::VERSION_WIN8) {
-    content::RenderWidgetHostView* rwhv = render_view_host->GetView();
+  content::RenderViewHost* rvh = web_contents()->GetRenderViewHost();
+
+  if (rvh && base::win::GetVersion() >= base::win::VERSION_WIN8) {
+    content::RenderWidgetHostView* rwhv = rvh->GetView();
     if (rwhv) {
       gfx::NativeView native_view = rwhv->GetNativeView();
       if (native_view) {
@@ -51,5 +52,3 @@ void NavigationMetricsRecorder::DidStartLoading(
   }
 #endif
 }
-
-
diff --git a/chrome/browser/tab_contents/navigation_metrics_recorder.h b/chrome/browser/tab_contents/navigation_metrics_recorder.h
index 6d3ad80..aaf96a3 100644
--- a/chrome/browser/tab_contents/navigation_metrics_recorder.h
+++ b/chrome/browser/tab_contents/navigation_metrics_recorder.h
@@ -23,7 +23,7 @@ class NavigationMetricsRecorder
       const content::LoadCommittedDetails& details,
       const content::FrameNavigateParams& params) override;
 
-  void DidStartLoading(content::RenderViewHost* render_view_host) override;
+  void DidStartLoading() override;
 
   DISALLOW_COPY_AND_ASSIGN(NavigationMetricsRecorder);
 };
diff --git a/chrome/browser/thumbnails/thumbnail_tab_helper.cc b/chrome/browser/thumbnails/thumbnail_tab_helper.cc
index 63d626a..0db6199 100644
--- a/chrome/browser/thumbnails/thumbnail_tab_helper.cc
+++ b/chrome/browser/thumbnails/thumbnail_tab_helper.cc
@@ -162,8 +162,7 @@ void ThumbnailTabHelper::RenderViewDeleted(
   }
 }
 
-void ThumbnailTabHelper::DidStartLoading(
-    content::RenderViewHost* render_view_host) {
+void ThumbnailTabHelper::DidStartLoading() {
   load_interrupted_ = false;
 }
 
diff --git a/chrome/browser/thumbnails/thumbnail_tab_helper.h b/chrome/browser/thumbnails/thumbnail_tab_helper.h
index 560e443..8e97064 100644
--- a/chrome/browser/thumbnails/thumbnail_tab_helper.h
+++ b/chrome/browser/thumbnails/thumbnail_tab_helper.h
@@ -41,7 +41,7 @@ class ThumbnailTabHelper
 
   // content::WebContentsObserver overrides.
   void RenderViewDeleted(content::RenderViewHost* render_view_host) override;
-  void DidStartLoading(content::RenderViewHost* render_view_host) override;
+  void DidStartLoading() override;
   void NavigationStopped() override;
 
   // Update the thumbnail of the given tab contents if necessary.
diff --git a/chrome/browser/ui/tab_contents/core_tab_helper.cc b/chrome/browser/ui/tab_contents/core_tab_helper.cc
index 0e52c8d..8a95850 100644
--- a/chrome/browser/ui/tab_contents/core_tab_helper.cc
+++ b/chrome/browser/ui/tab_contents/core_tab_helper.cc
@@ -180,7 +180,7 @@ bool CoreTabHelper::GetStatusTextForWebContents(
 ////////////////////////////////////////////////////////////////////////////////
 // WebContentsObserver overrides
 
-void CoreTabHelper::DidStartLoading(content::RenderViewHost* render_view_host) {
+void CoreTabHelper::DidStartLoading() {
   UpdateContentRestrictions(0);
 }
 
diff --git a/chrome/browser/ui/tab_contents/core_tab_helper.h b/chrome/browser/ui/tab_contents/core_tab_helper.h
index 069edb2..c127aa7 100644
--- a/chrome/browser/ui/tab_contents/core_tab_helper.h
+++ b/chrome/browser/ui/tab_contents/core_tab_helper.h
@@ -59,7 +59,7 @@ class CoreTabHelper : public content::WebContentsObserver,
                                           content::WebContents* source);
 
   // content::WebContentsObserver overrides:
-  void DidStartLoading(content::RenderViewHost* render_view_host) override;
+  void DidStartLoading() override;
   void WasShown() override;
   void WebContentsDestroyed() override;
   void BeforeUnloadFired(const base::TimeTicks& proceed_time) override;
diff --git a/chrome/browser/ui/webui/password_manager_internals/password_manager_internals_ui.cc b/chrome/browser/ui/webui/password_manager_internals/password_manager_internals_ui.cc
index d4d8851..5ccf6db 100644
--- a/chrome/browser/ui/webui/password_manager_internals/password_manager_internals_ui.cc
+++ b/chrome/browser/ui/webui/password_manager_internals/password_manager_internals_ui.cc
@@ -49,15 +49,13 @@ PasswordManagerInternalsUI::~PasswordManagerInternalsUI() {
   UnregisterFromLoggingServiceIfNecessary();
 }
 
-void PasswordManagerInternalsUI::DidStartLoading(
-    content::RenderViewHost* /* render_view_host */) {
+void PasswordManagerInternalsUI::DidStartLoading() {
   // In case this tab is being reloaded, unregister itself until the reload is
   // completed.
   UnregisterFromLoggingServiceIfNecessary();
 }
 
-void PasswordManagerInternalsUI::DidStopLoading(
-    content::RenderViewHost* /* render_view_host */) {
+void PasswordManagerInternalsUI::DidStopLoading() {
   DCHECK(!registered_with_logging_service_);
   PasswordManagerInternalsService* service =
       PasswordManagerInternalsServiceFactory::GetForBrowserContext(
diff --git a/chrome/browser/ui/webui/password_manager_internals/password_manager_internals_ui.h b/chrome/browser/ui/webui/password_manager_internals/password_manager_internals_ui.h
index 8a4daa88..459a4b0 100644
--- a/chrome/browser/ui/webui/password_manager_internals/password_manager_internals_ui.h
+++ b/chrome/browser/ui/webui/password_manager_internals/password_manager_internals_ui.h
@@ -17,8 +17,8 @@ class PasswordManagerInternalsUI : public content::WebUIController,
   ~PasswordManagerInternalsUI() override;
 
   // WebContentsObserver implementation.
-  void DidStartLoading(content::RenderViewHost* render_view_host) override;
-  void DidStopLoading(content::RenderViewHost* render_view_host) override;
+  void DidStartLoading() override;
+  void DidStopLoading() override;
 
   // LogReceiver implementation.
   void LogSavePasswordProgress(const std::string& text) override;
diff --git a/content/browser/android/web_contents_observer_proxy.cc b/content/browser/android/web_contents_observer_proxy.cc
index 8566bee..a8e5eac 100644
--- a/content/browser/android/web_contents_observer_proxy.cc
+++ b/content/browser/android/web_contents_observer_proxy.cc
@@ -79,8 +79,7 @@ void WebContentsObserverProxy::RenderProcessGone(
                                                   was_oom_protected);
 }
 
-void WebContentsObserverProxy::DidStartLoading(
-    RenderViewHost* render_view_host) {
+void WebContentsObserverProxy::DidStartLoading() {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj(weak_java_observer_.get(env));
   if (obj.is_null())
@@ -91,8 +90,7 @@ void WebContentsObserverProxy::DidStartLoading(
                                                 jstring_url.obj());
 }
 
-void WebContentsObserverProxy::DidStopLoading(
-    RenderViewHost* render_view_host) {
+void WebContentsObserverProxy::DidStopLoading() {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj(weak_java_observer_.get(env));
   if (obj.is_null())
diff --git a/content/browser/android/web_contents_observer_proxy.h b/content/browser/android/web_contents_observer_proxy.h
index 1d45011..7ee1a22 100644
--- a/content/browser/android/web_contents_observer_proxy.h
+++ b/content/browser/android/web_contents_observer_proxy.h
@@ -32,8 +32,8 @@ class WebContentsObserverProxy : public WebContentsObserver {
  private:
   void RenderViewReady() override;
   void RenderProcessGone(base::TerminationStatus termination_status) override;
-  void DidStartLoading(RenderViewHost* render_view_host) override;
-  void DidStopLoading(RenderViewHost* render_view_host) override;
+  void DidStartLoading() override;
+  void DidStopLoading() override;
   void DidFailProvisionalLoad(RenderFrameHost* render_frame_host,
                               const GURL& validated_url,
                               int error_code,
diff --git a/content/browser/frame_host/interstitial_page_impl.cc b/content/browser/frame_host/interstitial_page_impl.cc
index 197d9d4..f7ee287 100644
--- a/content/browser/frame_host/interstitial_page_impl.cc
+++ b/content/browser/frame_host/interstitial_page_impl.cc
@@ -483,8 +483,7 @@ void InterstitialPageImpl::DidNavigate(
   // as complete. Without this, navigating in a UI test to a URL that triggers
   // an interstitial would hang.
   web_contents_was_loading_ = controller_->delegate()->IsLoading();
-  controller_->delegate()->SetIsLoading(
-      controller_->delegate()->GetRenderViewHost(), false, true, NULL);
+  controller_->delegate()->SetIsLoading(false, true, NULL);
 }
 
 RendererPreferences InterstitialPageImpl::GetRendererPrefs(
@@ -591,8 +590,7 @@ void InterstitialPageImpl::Proceed() {
 
   // Resumes the throbber, if applicable.
   if (web_contents_was_loading_)
-    controller_->delegate()->SetIsLoading(
-        controller_->delegate()->GetRenderViewHost(), true, true, NULL);
+    controller_->delegate()->SetIsLoading(true, true, NULL);
 
   // If this is a new navigation, the old page is going away, so we cancel any
   // blocked requests for it.  If it is not a new navigation, then it means the
diff --git a/content/browser/frame_host/navigation_controller_delegate.h b/content/browser/frame_host/navigation_controller_delegate.h
index 90fd4d3..e578a84 100644
--- a/content/browser/frame_host/navigation_controller_delegate.h
+++ b/content/browser/frame_host/navigation_controller_delegate.h
@@ -71,8 +71,7 @@ class NavigationControllerDelegate {
   virtual void AttachInterstitialPage(
       InterstitialPageImpl* interstitial_page) = 0;
   virtual void DetachInterstitialPage() = 0;
-  virtual void SetIsLoading(RenderViewHost* render_view_host,
-                            bool is_loading,
+  virtual void SetIsLoading(bool is_loading,
                             bool to_different_document,
                             LoadNotificationDetails* details) = 0;
 };
diff --git a/content/browser/frame_host/navigation_controller_impl_browsertest.cc b/content/browser/frame_host/navigation_controller_impl_browsertest.cc
index 66646f7..6f54e00 100644
--- a/content/browser/frame_host/navigation_controller_impl_browsertest.cc
+++ b/content/browser/frame_host/navigation_controller_impl_browsertest.cc
@@ -289,7 +289,7 @@ class FrameNavigateParamsCapturer : public WebContentsObserver {
       message_loop_runner_->Quit();
   }
 
-  void DidStopLoading(RenderViewHost* render_view_host) override {
+  void DidStopLoading() override {
     if (!navigations_remaining_)
       message_loop_runner_->Quit();
   }
@@ -359,9 +359,7 @@ class LoadCommittedCapturer : public WebContentsObserver {
       message_loop_runner_->Quit();
   }
 
-  void DidStopLoading(RenderViewHost* render_view_host) override {
-    message_loop_runner_->Quit();
-  }
+  void DidStopLoading() override { message_loop_runner_->Quit(); }
 
   // The id of the FrameTreeNode whose navigations to observe.
   int frame_tree_node_id_;
diff --git a/content/browser/frame_host/navigation_controller_impl_unittest.cc b/content/browser/frame_host/navigation_controller_impl_unittest.cc
index 3b56740..c18ca9b 100644
--- a/content/browser/frame_host/navigation_controller_impl_unittest.cc
+++ b/content/browser/frame_host/navigation_controller_impl_unittest.cc
@@ -3078,7 +3078,7 @@ TEST_F(NavigationControllerTest, ShowBrowserURLAfterFailUntilModified) {
   params.showing_repost_interstitial = false;
   main_test_rfh()->OnMessageReceived(
       FrameHostMsg_DidFailProvisionalLoadWithError(0, params));
-  contents()->SetIsLoading(test_rvh(), false, true, NULL);
+  contents()->SetIsLoading(false, true, NULL);
   EXPECT_EQ(url, controller.GetVisibleEntry()->GetURL());
 
   // If something else later modifies the contents of the about:blank page, then
diff --git a/content/browser/web_contents/aura/overscroll_navigation_overlay.cc b/content/browser/web_contents/aura/overscroll_navigation_overlay.cc
index a96b0d2..c0c4a41 100644
--- a/content/browser/web_contents/aura/overscroll_navigation_overlay.cc
+++ b/content/browser/web_contents/aura/overscroll_navigation_overlay.cc
@@ -304,7 +304,7 @@ void OverscrollNavigationOverlay::DidFirstVisuallyNonEmptyPaint() {
   }
 }
 
-void OverscrollNavigationOverlay::DidStopLoading(RenderViewHost* host) {
+void OverscrollNavigationOverlay::DidStopLoading() {
   // Don't compare URLs in this case - it's possible they won't match if
   // a gesture-nav initiated navigation was interrupted by some other in-site
   // navigation ((e.g., from a script, or from a bookmark).
diff --git a/content/browser/web_contents/aura/overscroll_navigation_overlay.h b/content/browser/web_contents/aura/overscroll_navigation_overlay.h
index db9871c..6e0ec07 100644
--- a/content/browser/web_contents/aura/overscroll_navigation_overlay.h
+++ b/content/browser/web_contents/aura/overscroll_navigation_overlay.h
@@ -89,7 +89,7 @@ class CONTENT_EXPORT OverscrollNavigationOverlay
 
   // Overridden from WebContentsObserver:
   void DidFirstVisuallyNonEmptyPaint() override;
-  void DidStopLoading(RenderViewHost* host) override;
+  void DidStopLoading() override;
 
   // The WebContents which is being navigated.
   WebContentsImpl* web_contents_;
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 9b4875c..e4b6baf 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -3392,8 +3392,7 @@ bool WebContentsImpl::HasAccessedInitialDocument() {
 
 // Notifies the RenderWidgetHost instance about the fact that the page is
 // loading, or done loading.
-void WebContentsImpl::SetIsLoading(RenderViewHost* render_view_host,
-                                   bool is_loading,
+void WebContentsImpl::SetIsLoading(bool is_loading,
                                    bool to_different_document,
                                    LoadNotificationDetails* details) {
   if (is_loading == is_loading_)
@@ -3421,13 +3420,11 @@ void WebContentsImpl::SetIsLoading(RenderViewHost* render_view_host,
   if (is_loading) {
     TRACE_EVENT_ASYNC_BEGIN1("browser,navigation", "WebContentsImpl Loading",
                              this, "URL", url);
-    FOR_EACH_OBSERVER(WebContentsObserver, observers_,
-                      DidStartLoading(render_view_host));
+    FOR_EACH_OBSERVER(WebContentsObserver, observers_, DidStartLoading());
   } else {
     TRACE_EVENT_ASYNC_END1("browser,navigation", "WebContentsImpl Loading",
                            this, "URL", url);
-    FOR_EACH_OBSERVER(WebContentsObserver, observers_,
-                      DidStopLoading(render_view_host));
+    FOR_EACH_OBSERVER(WebContentsObserver, observers_, DidStopLoading());
   }
 
   // TODO(avi): Remove. http://crbug.com/170921
@@ -3835,7 +3832,7 @@ void WebContentsImpl::RenderViewTerminated(RenderViewHost* rvh,
   if (delegate_)
     delegate_->HideValidationMessage(this);
 
-  SetIsLoading(rvh, false, true, NULL);
+  SetIsLoading(false, true, nullptr);
   NotifyDisconnected();
   SetIsCrashed(status, error_code);
 
@@ -3943,8 +3940,7 @@ void WebContentsImpl::RequestMove(const gfx::Rect& new_bounds) {
 
 void WebContentsImpl::DidStartLoading(RenderFrameHost* render_frame_host,
                                       bool to_different_document) {
-  SetIsLoading(render_frame_host->GetRenderViewHost(), true,
-               to_different_document, NULL);
+  SetIsLoading(true, to_different_document, nullptr);
 
   // Notify accessibility that the user is navigating away from the
   // current document.
@@ -3980,8 +3976,7 @@ void WebContentsImpl::DidStopLoading(RenderFrameHost* render_frame_host) {
         controller_.GetCurrentEntryIndex()));
   }
 
-  SetIsLoading(render_frame_host->GetRenderViewHost(), false, true,
-               details.get());
+  SetIsLoading(false, true, details.get());
 }
 
 void WebContentsImpl::DidCancelLoading() {
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index 3a86786..19f42c0 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -660,8 +660,7 @@ class CONTENT_EXPORT WebContentsImpl
   // Changes the IsLoading state and notifies the delegate as needed.
   // |details| is used to provide details on the load that just finished
   // (but can be null if not applicable).
-  void SetIsLoading(RenderViewHost* render_view_host,
-                    bool is_loading,
+  void SetIsLoading(bool is_loading,
                     bool to_different_document,
                     LoadNotificationDetails* details) override;
 
diff --git a/content/browser/web_contents/web_contents_impl_browsertest.cc b/content/browser/web_contents/web_contents_impl_browsertest.cc
index 876bd7b..8cdfedf 100644
--- a/content/browser/web_contents/web_contents_impl_browsertest.cc
+++ b/content/browser/web_contents/web_contents_impl_browsertest.cc
@@ -497,14 +497,14 @@ struct LoadProgressDelegateAndObserver : public WebContentsDelegate,
   }
 
   // WebContentsObserver:
-  void DidStartLoading(RenderViewHost* render_view_host) override {
+  void DidStartLoading() override {
     EXPECT_FALSE(did_start_loading);
     EXPECT_EQ(0U, progresses.size());
     EXPECT_FALSE(did_stop_loading);
     did_start_loading = true;
   }
 
-  void DidStopLoading(RenderViewHost* render_view_host) override {
+  void DidStopLoading() override {
     EXPECT_TRUE(did_start_loading);
     EXPECT_GE(progresses.size(), 1U);
     EXPECT_FALSE(did_stop_loading);
@@ -642,4 +642,3 @@ IN_PROC_BROWSER_TEST_F(WebContentsImplBrowserTest,
 }
 
 }  // namespace content
-
diff --git a/content/browser/web_contents/web_contents_impl_unittest.cc b/content/browser/web_contents/web_contents_impl_unittest.cc
index d56e218..67e8e40 100644
--- a/content/browser/web_contents/web_contents_impl_unittest.cc
+++ b/content/browser/web_contents/web_contents_impl_unittest.cc
@@ -2765,12 +2765,8 @@ class LoadingWebContentsObserver : public WebContentsObserver {
   }
   ~LoadingWebContentsObserver() override {}
 
-  void DidStartLoading(RenderViewHost* rvh) override {
-    is_loading_ = true;
-  }
-  void DidStopLoading(RenderViewHost* rvh) override {
-    is_loading_ = false;
-  }
+  void DidStartLoading() override { is_loading_ = true; }
+  void DidStopLoading() override { is_loading_ = false; }
 
   bool is_loading() const { return is_loading_; }
 
diff --git a/content/public/browser/web_contents_observer.h b/content/public/browser/web_contents_observer.h
index 0cc85e0..a176d18 100644
--- a/content/public/browser/web_contents_observer.h
+++ b/content/public/browser/web_contents_observer.h
@@ -244,8 +244,8 @@ class CONTENT_EXPORT WebContentsObserver : public IPC::Listener,
 
   // These two methods correspond to the points in time when the spinner of the
   // tab starts and stops spinning.
-  virtual void DidStartLoading(RenderViewHost* render_view_host) {}
-  virtual void DidStopLoading(RenderViewHost* render_view_host) {}
+  virtual void DidStartLoading() {}
+  virtual void DidStopLoading() {}
 
   // When WebContents::Stop() is called, the WebContents stops loading and then
   // invokes this method. If there are ongoing navigations, their respective
diff --git a/content/public/test/browser_test_utils.cc b/content/public/test/browser_test_utils.cc
index 6ac4f13..afb07ba 100644
--- a/content/public/test/browser_test_utils.cc
+++ b/content/public/test/browser_test_utils.cc
@@ -795,7 +795,7 @@ const base::string16& TitleWatcher::WaitAndGetTitle() {
   return observed_title_;
 }
 
-void TitleWatcher::DidStopLoading(RenderViewHost* render_view_host) {
+void TitleWatcher::DidStopLoading() {
   // When navigating through the history, the restored NavigationEntry's title
   // will be used. If the entry ends up having the same title after we return
   // to it, as will usually be the case, then WebContentsObserver::TitleSet
diff --git a/content/public/test/browser_test_utils.h b/content/public/test/browser_test_utils.h
index a13df28..7c2a20b 100644
--- a/content/public/test/browser_test_utils.h
+++ b/content/public/test/browser_test_utils.h
@@ -275,7 +275,7 @@ class TitleWatcher : public WebContentsObserver {
 
  private:
   // Overridden WebContentsObserver methods.
-  void DidStopLoading(RenderViewHost* render_view_host) override;
+  void DidStopLoading() override;
   void TitleWasSet(NavigationEntry* entry, bool explicit_set) override;
 
   void TestTitle();
diff --git a/content/public/test/test_navigation_observer.cc b/content/public/test/test_navigation_observer.cc
index b82bda9..7c2d028 100644
--- a/content/public/test/test_navigation_observer.cc
+++ b/content/public/test/test_navigation_observer.cc
@@ -38,11 +38,11 @@ class TestNavigationObserver::TestWebContentsObserver
     parent_->OnWebContentsDestroyed(this, web_contents());
   }
 
-  void DidStartLoading(RenderViewHost* render_view_host) override {
+  void DidStartLoading() override {
     parent_->OnDidStartLoading(web_contents());
   }
 
-  void DidStopLoading(RenderViewHost* render_view_host) override {
+  void DidStopLoading() override {
     parent_->OnDidStopLoading(web_contents());
   }
 
diff --git a/content/test/test_web_contents.cc b/content/test/test_web_contents.cc
index d3f47f6..a3e164a 100644
--- a/content/test/test_web_contents.cc
+++ b/content/test/test_web_contents.cc
@@ -139,7 +139,7 @@ void TestWebContents::NavigateAndCommit(const GURL& url) {
 }
 
 void TestWebContents::TestSetIsLoading(bool value) {
-  SetIsLoading(GetRenderViewHost(), value, true, NULL);
+  SetIsLoading(value, true, nullptr);
 }
 
 void TestWebContents::CommitPendingNavigation() {
diff --git a/extensions/browser/extension_host.cc b/extensions/browser/extension_host.cc
index 4ab887d..8993655 100644
--- a/extensions/browser/extension_host.cc
+++ b/extensions/browser/extension_host.cc
@@ -267,7 +267,7 @@ void ExtensionHost::RenderProcessGone(base::TerminationStatus status) {
       content::Details<ExtensionHost>(this));
 }
 
-void ExtensionHost::DidStartLoading(content::RenderViewHost* render_view_host) {
+void ExtensionHost::DidStartLoading() {
   if (!has_loaded_once_) {
     FOR_EACH_OBSERVER(DeferredStartRenderHostObserver,
                       deferred_start_render_host_observer_list_,
@@ -275,7 +275,7 @@ void ExtensionHost::DidStartLoading(content::RenderViewHost* render_view_host) {
   }
 }
 
-void ExtensionHost::DidStopLoading(content::RenderViewHost* render_view_host) {
+void ExtensionHost::DidStopLoading() {
   // Only record UMA for the first load. Subsequent loads will likely behave
   // quite different, and it's first load we're most interested in.
   bool first_load = !has_loaded_once_;
diff --git a/extensions/browser/extension_host.h b/extensions/browser/extension_host.h
index 83d3f11..07f0c62 100644
--- a/extensions/browser/extension_host.h
+++ b/extensions/browser/extension_host.h
@@ -103,8 +103,8 @@ class ExtensionHost : public DeferredStartRenderHost,
   void RenderViewReady() override;
   void RenderProcessGone(base::TerminationStatus status) override;
   void DocumentAvailableInMainFrame() override;
-  void DidStartLoading(content::RenderViewHost* render_view_host) override;
-  void DidStopLoading(content::RenderViewHost* render_view_host) override;
+  void DidStartLoading() override;
+  void DidStopLoading() override;
 
   // content::WebContentsDelegate:
   content::JavaScriptDialogManager* GetJavaScriptDialogManager(
diff --git a/extensions/browser/guest_view/extension_options/extension_options_guest.cc b/extensions/browser/guest_view/extension_options/extension_options_guest.cc
index 11e7062..2526ce2 100644
--- a/extensions/browser/guest_view/extension_options/extension_options_guest.cc
+++ b/extensions/browser/guest_view/extension_options/extension_options_guest.cc
@@ -125,7 +125,7 @@ void ExtensionOptionsGuest::DidInitialize(
                                           std::string());
 }
 
-void ExtensionOptionsGuest::DidStopLoading() {
+void ExtensionOptionsGuest::GuestViewDidStopLoading() {
   scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue());
   DispatchEventToView(new GuestViewBase::Event(
       extension_options_internal::OnLoad::kEventName, args.Pass()));
diff --git a/extensions/browser/guest_view/extension_options/extension_options_guest.h b/extensions/browser/guest_view/extension_options/extension_options_guest.h
index 141906d..f3b9bec 100644
--- a/extensions/browser/guest_view/extension_options/extension_options_guest.h
+++ b/extensions/browser/guest_view/extension_options/extension_options_guest.h
@@ -30,7 +30,7 @@ class ExtensionOptionsGuest
   void CreateWebContents(const base::DictionaryValue& create_params,
                          const WebContentsCreatedCallback& callback) override;
   void DidInitialize(const base::DictionaryValue& create_params) override;
-  void DidStopLoading() override;
+  void GuestViewDidStopLoading() override;
   const char* GetAPINamespace() const override;
   int GetTaskPrefix() const override;
   bool IsPreferredSizeModeEnabled() const override;
diff --git a/extensions/browser/guest_view/guest_view_base.cc b/extensions/browser/guest_view/guest_view_base.cc
index 29718ff..980bd2f 100644
--- a/extensions/browser/guest_view/guest_view_base.cc
+++ b/extensions/browser/guest_view/guest_view_base.cc
@@ -545,18 +545,19 @@ double GuestViewBase::PhysicalPixelsToLogicalPixels(int physical_pixels) {
   return physical_pixels / zoom_factor;
 }
 
-void GuestViewBase::DidStopLoading(content::RenderViewHost* render_view_host) {
-  if (IsPreferredSizeModeEnabled()) {
-    render_view_host->EnablePreferredSizeMode();
-  }
+void GuestViewBase::DidStopLoading() {
+  content::RenderViewHost* rvh = web_contents()->GetRenderViewHost();
+
+  if (IsPreferredSizeModeEnabled())
+    rvh->EnablePreferredSizeMode();
   if (!IsDragAndDropEnabled()) {
-    const char script[] = "window.addEventListener('dragstart', function() { "
-                          "  window.event.preventDefault(); "
-                          "});";
-    render_view_host->GetMainFrame()->ExecuteJavaScript(
-        base::ASCIIToUTF16(script));
+    const char script[] =
+        "window.addEventListener('dragstart', function() { "
+        "  window.event.preventDefault(); "
+        "});";
+    rvh->GetMainFrame()->ExecuteJavaScript(base::ASCIIToUTF16(script));
   }
-  DidStopLoading();
+  GuestViewDidStopLoading();
 }
 
 void GuestViewBase::RenderViewReady() {
diff --git a/extensions/browser/guest_view/guest_view_base.h b/extensions/browser/guest_view/guest_view_base.h
index 549fa1e..bf30654 100644
--- a/extensions/browser/guest_view/guest_view_base.h
+++ b/extensions/browser/guest_view/guest_view_base.h
@@ -103,7 +103,7 @@ class GuestViewBase : public content::BrowserPluginGuestDelegate,
 
   // This method is called when the initial set of frames within the page have
   // completed loading.
-  virtual void DidStopLoading() {}
+  virtual void GuestViewDidStopLoading() {}
 
   // This method is called before the embedder is destroyed.
   // |owner_web_contents_| should still be valid during this call. This
@@ -323,7 +323,7 @@ class GuestViewBase : public content::BrowserPluginGuestDelegate,
   double PhysicalPixelsToLogicalPixels(int physical_pixels);
 
   // WebContentsObserver implementation.
-  void DidStopLoading(content::RenderViewHost* render_view_host) final;
+  void DidStopLoading() final;
   void RenderViewReady() final;
   void WebContentsDestroyed() final;
 
diff --git a/extensions/browser/guest_view/web_view/web_view_guest.cc b/extensions/browser/guest_view/web_view/web_view_guest.cc
index 5121d77..701d080 100644
--- a/extensions/browser/guest_view/web_view/web_view_guest.cc
+++ b/extensions/browser/guest_view/web_view/web_view_guest.cc
@@ -315,7 +315,7 @@ void WebViewGuest::AttachWebViewHelpers(WebContents* contents) {
   web_view_permission_helper_.reset(new WebViewPermissionHelper(this));
 }
 
-void WebViewGuest::DidStopLoading() {
+void WebViewGuest::GuestViewDidStopLoading() {
   scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue());
   DispatchEventToView(
       new GuestViewBase::Event(webview::kEventLoadStop, args.Pass()));
diff --git a/extensions/browser/guest_view/web_view/web_view_guest.h b/extensions/browser/guest_view/web_view/web_view_guest.h
index aef60ad..88bfac2 100644
--- a/extensions/browser/guest_view/web_view/web_view_guest.h
+++ b/extensions/browser/guest_view/web_view/web_view_guest.h
@@ -97,7 +97,7 @@ class WebViewGuest : public GuestView<WebViewGuest>,
   void DidAttachToEmbedder() override;
   void DidDropLink(const GURL& url) override;
   void DidInitialize(const base::DictionaryValue& create_params) override;
-  void DidStopLoading() override;
+  void GuestViewDidStopLoading() override;
   void EmbedderFullscreenToggled(bool entered_fullscreen) override;
   void EmbedderWillBeDestroyed() override;
   const char* GetAPINamespace() const override;