Move DidStartLoading, DidStopLoading, DidChangeLoadProgress to RFHI.

content/browser/web_contents/web_contents_impl_browsertest.cc

 // Copyright 2013 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/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "content/browser/frame_host/navigation_entry_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/browser/web_contents/web_contents_view.h"
 #include "content/common/frame_messages.h"
@@ skipping 473 matching lines @@
                                          public WebContentsObserver {
   LoadProgressDelegateAndObserver(Shell* shell)
       : WebContentsObserver(shell->web_contents()),
         did_start_loading(false),
         did_stop_loading(false) {
     web_contents()->SetDelegate(this);
   }
 
   // WebContentsDelegate:
   void LoadProgressChanged(WebContents* source, double progress) override {
     EXPECT_TRUE(did_start_loading);

[Fabrice (no longer in Chrome), 2015/04/16 13:55:26]

This implies DidStartLoading was called before the load progress was updated.

     EXPECT_FALSE(did_stop_loading);
     progresses.push_back(progress);
   }
 
   // WebContentsObserver:
   void DidStartLoading() override {
     EXPECT_FALSE(did_start_loading);
     EXPECT_EQ(0U, progresses.size());

[Fabrice (no longer in Chrome), 2015/04/16 13:55:26]

This implies there has been no loading progress update prior to calling
DidStartLoading.

     EXPECT_FALSE(did_stop_loading);
     did_start_loading = true;
   }
 
   void DidStopLoading() override {
     EXPECT_TRUE(did_start_loading);
     EXPECT_GE(progresses.size(), 1U);

[Fabrice (no longer in Chrome), 2015/04/16 13:55:26]

This implies there has been at least one load progress update before calling
DidStopLoading.

     EXPECT_FALSE(did_stop_loading);
     did_stop_loading = true;
   }
 
   bool did_start_loading;
   std::vector<double> progresses;
   bool did_stop_loading;
 };
 
 IN_PROC_BROWSER_TEST_F(WebContentsImplBrowserTest, LoadProgress) {
@@ skipping 49 matching lines @@
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
 
   // Start at a real page.
   NavigateToURL(shell(), embedded_test_server()->GetURL("/title1.html"));
 
   // Simulate a navigation that has not completed.
   scoped_ptr<LoadProgressDelegateAndObserver> delegate(
       new LoadProgressDelegateAndObserver(shell()));
   RenderFrameHost* main_frame = shell()->web_contents()->GetMainFrame();
   FrameHostMsg_DidStartLoading start_msg(main_frame->GetRoutingID(), true);
-  static_cast<WebContentsImpl*>(shell()->web_contents())->OnMessageReceived(
-      main_frame, start_msg);
+  static_cast<RenderFrameHostImpl*>(main_frame)->OnMessageReceived(start_msg);
   EXPECT_TRUE(delegate->did_start_loading);
   EXPECT_FALSE(delegate->did_stop_loading);
 
   // Also simulate a DidChangeLoadProgress, but not a DidStopLoading.
   FrameHostMsg_DidChangeLoadProgress progress_msg(main_frame->GetRoutingID(),
                                                   1.0);
-  static_cast<WebContentsImpl*>(shell()->web_contents())->OnMessageReceived(
-      main_frame, progress_msg);
+  static_cast<RenderFrameHostImpl*>(main_frame)->OnMessageReceived(
+      progress_msg);
   EXPECT_TRUE(delegate->did_start_loading);
   EXPECT_FALSE(delegate->did_stop_loading);
 
   // Now interrupt with a new cross-process navigation.
   TestNavigationObserver tab_observer(shell()->web_contents(), 1);
   GURL url(embedded_test_server()->GetURL("foo.com", "/title2.html"));
   shell()->LoadURL(url);
   tab_observer.Wait();
   EXPECT_EQ(url, shell()->web_contents()->GetLastCommittedURL());
 
@@ skipping 36 matching lines @@
   scoped_ptr<FirstVisuallyNonEmptyPaintObserver> observer(
       new FirstVisuallyNonEmptyPaintObserver(shell()));
 
   NavigateToURL(shell(), embedded_test_server()->GetURL("/title1.html"));
 
   observer->WaitForDidFirstVisuallyNonEmptyPaint();
   ASSERT_TRUE(observer->did_fist_visually_non_empty_paint_);
 }
 
 }  // namespace content