Fix flakiness in DragAndDropBrowserTests

content/test/content_browser_test_utils_internal.h

 // 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.
 
 #ifndef CONTENT_TEST_CONTENT_BROWSER_TEST_UTILS_INTERNAL_H_
 #define CONTENT_TEST_CONTENT_BROWSER_TEST_UTILS_INTERNAL_H_
 
 // A collection of functions designed for use with content_shell based browser
 // tests internal to the content/ module.
 // Note: If a function here also works with browser_tests, it should be in
 // the content public API.
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/run_loop.h"
 #include "cc/surfaces/surface_id.h"
 #include "content/public/browser/resource_dispatcher_host_delegate.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/common/file_chooser_params.h"
 #include "content/public/test/browser_test_utils.h"
 #include "url/gurl.h"
 
-namespace cc {
-class SurfaceManager;
-}
-
 namespace content {
 
 class FrameTreeNode;
 class RenderFrameHost;
-class RenderWidgetHostViewChildFrame;
 class Shell;
 class SiteInstance;
 class ToRenderFrameHost;
 
 // Navigates the frame represented by |node| to |url|, blocking until the
 // navigation finishes.
 void NavigateFrameToURL(FrameTreeNode* node, const GURL& url);
 
 // Sets the DialogManager to proceed by default or not when showing a
 // BeforeUnload dialog.
@@ skipping 64 matching lines @@
   void RequestBeginning(net::URLRequest* request,
                         content::ResourceContext* resource_context,
                         content::AppCacheService* appcache_service,
                         ResourceType resource_type,
                         std::vector<std::unique_ptr<content::ResourceThrottle>>*
                             throttles) override;
 
   GURL url_;
 };
 
-// Helper class to assist with hit testing surfaces in multiple processes.
-// WaitForSurfaceReady() will only return after a Surface from |target_view|
-// has been composited in the top-level frame's Surface. At that point,
-// browser process hit testing to target_view's Surface can succeed.
-class SurfaceHitTestReadyNotifier {
- public:
-  SurfaceHitTestReadyNotifier(RenderWidgetHostViewChildFrame* target_view);
-  ~SurfaceHitTestReadyNotifier() {}
-
-  void WaitForSurfaceReady();
-
- private:
-  bool ContainsSurfaceId(const cc::SurfaceId& container_surface_id);
-
-  cc::SurfaceManager* surface_manager_;
-  cc::SurfaceId root_surface_id_;
-  RenderWidgetHostViewChildFrame* target_view_;
-
-  DISALLOW_COPY_AND_ASSIGN(SurfaceHitTestReadyNotifier);
-};
-
 // Helper for mocking choosing a file via a file dialog.
 class FileChooserDelegate : public WebContentsDelegate {
  public:
   // Constructs a WebContentsDelegate that mocks a file dialog.
   // The mocked file dialog will always reply that the user selected |file|.
   FileChooserDelegate(const base::FilePath& file);
 
   // Implementation of WebContentsDelegate::RunFileChooser.
   void RunFileChooser(RenderFrameHost* render_frame_host,
                       const FileChooserParams& params) override;
@@ skipping 49 matching lines @@
 
   // The RunLoop used to spin the message loop.
   base::RunLoop run_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(UrlCommitObserver);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_TEST_CONTENT_BROWSER_TEST_UTILS_INTERNAL_H_