Remove DidCommitCompositorFrame from RenderViewObserver.

content/renderer/visual_state_browsertest.cc

Index: content/renderer/visual_state_browsertest.cc
diff --git a/content/renderer/visual_state_browsertest.cc b/content/renderer/visual_state_browsertest.cc
index 26d9a6ddd26cb6ae254ec6db14fc406ed8db4fdc..55c47a4b1405071e74fd272a19343bae6a92ee37 100644
--- a/content/renderer/visual_state_browsertest.cc
+++ b/content/renderer/visual_state_browsertest.cc
@@ -7,8 +7,8 @@
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
+#include "content/public/renderer/render_frame_observer.h"
 #include "content/public/renderer/render_view.h"
-#include "content/public/renderer/render_view_observer.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"
@@ -18,11 +18,12 @@
 
 namespace content {
 
-class CommitObserver : public RenderViewObserver {
+class CommitObserver : public RenderFrameObserver {
  public:
-  CommitObserver(RenderView* render_view)
-      : RenderViewObserver(render_view), quit_closures_(), commit_count_(0) {}
+  CommitObserver(RenderFrame* render_frame)
+      : RenderFrameObserver(render_frame), quit_closures_(), commit_count_(0) {}
 
+  // RenderFrameObserver
   void DidCommitCompositorFrame() override {
     commit_count_++;
     for (base::Closure* closure : quit_closures_) {
@@ -98,8 +99,9 @@ IN_PROC_BROWSER_TEST_F(VisualStateTest, DISABLED_CallbackDoesNotDeadlock) {
   // with a high level of confidence if we used a timeout, but that's
   // discouraged (see https://codereview.chromium.org/939673002).
   NavigateToURL(shell(), GURL("about:blank"));
-  CommitObserver observer(
-      RenderView::FromRoutingID(shell()->web_contents()->GetRoutingID()));
+  RenderView* render_view =
+      RenderView::FromRoutingID(shell()->web_contents()->GetRoutingID());
+  CommitObserver observer(render_view->GetMainRenderFrame());
 
   // Wait for the commit corresponding to the load.