Use observer pattern instead of sniffing SwapCompositorFrame IPC

chrome/browser/apps/guest_view/web_view_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 <queue>
 #include <set>
 #include <utility>
 
 #include "base/callback_helpers.h"
 #include "base/files/file_util.h"
@@ skipping 804 matching lines @@
     }
     return manager;
   }
 
   WebViewTestBase() : guest_web_contents_(NULL), embedder_web_contents_(NULL) {
     GuestViewManager::set_factory_for_testing(&factory_);
   }
 
   ~WebViewTestBase() override {}
 
- protected:
-  scoped_refptr<content::FrameWatcher> frame_watcher_;
-
  private:
   bool UsesFakeSpeech() {
     const testing::TestInfo* const test_info =
         testing::UnitTest::GetInstance()->current_test_info();
 
     // SpeechRecognition test specific SetUp.
     const char* name = "SpeechRecognitionAPI_HasPermissionAllow";
     return !strncmp(test_info->name(), name, strlen(name));
   }
 
@@ skipping 3034 matching lines @@
 
   void SetUpCommandLine(base::CommandLine* command_line) override {
     WebViewTest::SetUpCommandLine(command_line);
 
     command_line->AppendSwitchASCII(
         switches::kTouchEventFeatureDetection,
         switches::kTouchEventFeatureDetectionEnabled);
   }
 
   void ForceCompositorFrame() {
-    if (!frame_watcher_) {
-      frame_watcher_ = new content::FrameWatcher();
-      frame_watcher_->AttachTo(GetEmbedderWebContents());
-    }
+    frame_watcher_.Observe(GetEmbedderWebContents());
 
     while (!RequestFrame(GetEmbedderWebContents())) {
       // RequestFrame failed because we were waiting on an ack ... wait a short
       // time and retry.
       base::RunLoop run_loop;
       base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
           FROM_HERE, run_loop.QuitClosure(),
           base::TimeDelta::FromMilliseconds(10));
       run_loop.Run();
     }
-    frame_watcher_->WaitFrames(1);
+    frame_watcher_.WaitFrames(1);
   }
 
  private:
-  scoped_refptr<content::FrameWatcher> frame_watcher_;
+  content::FrameWatcher frame_watcher_;
 };
 INSTANTIATE_TEST_CASE_P(WebViewTests, WebViewFocusTest, testing::Values(false));
 
 // The following test verifies that a views::WebView hosting an embedder
 // gains focus on touchstart.
 IN_PROC_BROWSER_TEST_P(WebViewFocusTest, TouchFocusesEmbedder) {
   LoadAppWithGuest("web_view/accept_touch_events");
 
   content::WebContents* web_contents = GetEmbedderWebContents();
   content::RenderViewHost* embedder_rvh = web_contents->GetRenderViewHost();
@@ skipping 97 matching lines @@
                        ClosingChromeSignInShouldNotCrash) {
   GURL signin_url{"chrome://chrome-signin"};
 
   AddTabAtIndex(0, signin_url, ui::PAGE_TRANSITION_TYPED);
   AddTabAtIndex(1, signin_url, ui::PAGE_TRANSITION_TYPED);
   WaitForWebViewInDom();
 
   chrome::CloseTab(browser());
 }
 #endif