Use observer pattern instead of sniffing SwapCompositorFrame IPC

content/browser/renderer_host/input/touch_action_browsertest.cc

 // Copyright 2014 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 <utility>
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/macros.h"
@@ skipping 74 matching lines @@
     EXPECT_EQ(SyntheticGesture::GESTURE_FINISHED, result);
     runner_->Quit();
   }
 
  protected:
   void LoadURL() {
     const GURL data_url(kTouchActionDataURL);
     NavigateToURL(shell(), data_url);
 
     RenderWidgetHostImpl* host = GetWidgetHost();
-    scoped_refptr<FrameWatcher> frame_watcher(new FrameWatcher());
-    frame_watcher->AttachTo(shell()->web_contents());
+    FrameWatcher frame_watcher(shell()->web_contents());
     host->GetView()->SetSize(gfx::Size(400, 400));
 
     base::string16 ready_title(base::ASCIIToUTF16("ready"));
     TitleWatcher watcher(shell()->web_contents(), ready_title);
     ignore_result(watcher.WaitAndGetTitle());
 
     // We need to wait until at least one frame has been composited
     // otherwise the injection of the synthetic gestures may get
     // dropped because of MainThread/Impl thread sync of touch event
     // regions.
-    frame_watcher->WaitFrames(1);
+    frame_watcher.WaitFrames(1);
   }
 
   // ContentBrowserTest:
   void SetUpCommandLine(base::CommandLine* cmd) override {
     cmd->AppendSwitchASCII(switches::kTouchEventFeatureDetection,
                            switches::kTouchEventFeatureDetectionEnabled);
     // TODO(rbyers): Remove this switch once touch-action ships.
     // http://crbug.com/241964
     cmd->AppendSwitch(switches::kEnableExperimentalWebPlatformFeatures);
   }
@@ skipping 14 matching lines @@
   // it didn't scroll at all.
   bool DoTouchScroll(const gfx::Point& point,
                      const gfx::Vector2d& distance,
                      bool wait_until_scrolled) {
     EXPECT_EQ(0, GetScrollTop());
 
     int scrollHeight = ExecuteScriptAndExtractInt(
         "document.documentElement.scrollHeight");
     EXPECT_EQ(10200, scrollHeight);
 
-    scoped_refptr<FrameWatcher> frame_watcher(new FrameWatcher());
-    frame_watcher->AttachTo(shell()->web_contents());
+    FrameWatcher frame_watcher(shell()->web_contents());
 
     SyntheticSmoothScrollGestureParams params;
     params.gesture_source_type = SyntheticGestureParams::TOUCH_INPUT;
     params.anchor = gfx::PointF(point);
     params.distances.push_back(-distance);
 
     runner_ = new MessageLoopRunner();
 
     std::unique_ptr<SyntheticSmoothScrollGesture> gesture(
         new SyntheticSmoothScrollGesture(params));
     GetWidgetHost()->QueueSyntheticGesture(
         std::move(gesture),
         base::Bind(&TouchActionBrowserTest::OnSyntheticGestureCompleted,
                    base::Unretained(this)));
 
     // Runs until we get the OnSyntheticGestureCompleted callback
     runner_->Run();
     runner_ = NULL;
 
     // Expect that the compositor scrolled at least one pixel while the
     // main thread was in a busy loop.
     while (wait_until_scrolled &&
-           frame_watcher->LastMetadata().root_scroll_offset.y() <
+           frame_watcher.LastMetadata().root_scroll_offset.y() <
                (distance.y() / 2)) {
-      frame_watcher->WaitFrames(1);
+      frame_watcher.WaitFrames(1);
     }
 
     // Check the scroll offset
     int scrollTop = GetScrollTop();
     if (scrollTop == 0)
       return false;
 
     // Allow for 1px rounding inaccuracies for some screen sizes.
     EXPECT_LT(distance.y() / 2, scrollTop);
     return true;
@@ skipping 39 matching lines @@
       DoTouchScroll(gfx::Point(50, 150), gfx::Vector2d(0, 45), false);
   EXPECT_FALSE(scrolled);
 
   EXPECT_EQ(1, ExecuteScriptAndExtractInt("eventCounts.touchstart"));
   EXPECT_GE(ExecuteScriptAndExtractInt("eventCounts.touchmove"), 1);
   EXPECT_EQ(1, ExecuteScriptAndExtractInt("eventCounts.touchend"));
   EXPECT_EQ(0, ExecuteScriptAndExtractInt("eventCounts.touchcancel"));
 }
 
 }  // namespace content