cc: Clean up LayerTreeTest and TestHooks.

cc/trees/proxy_impl.h

 // Copyright 2015 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 CC_TREES_PROXY_IMPL_H_
 #define CC_TREES_PROXY_IMPL_H_
 
 #include <memory>
 
 #include "base/macros.h"
 #include "cc/base/completion_event.h"
 #include "cc/base/delayed_unique_notifier.h"
 #include "cc/input/top_controls_state.h"
 #include "cc/scheduler/scheduler.h"
 #include "cc/trees/channel_impl.h"
 #include "cc/trees/layer_tree_host_impl.h"
 
 namespace cc {
 
 // This class aggregates all the interactions that the main side of the
 // compositor needs to have with the impl side. It is created and owned by the
 // ChannelImpl implementation. The class lives entirely on the impl thread.
 class CC_EXPORT ProxyImpl : public NON_EXPORTED_BASE(LayerTreeHostImplClient),
                             public NON_EXPORTED_BASE(SchedulerClient) {
  public:
-  static std::unique_ptr<ProxyImpl> Create(
-      ChannelImpl* channel_impl,
-      LayerTreeHost* layer_tree_host,
-      TaskRunnerProvider* task_runner_provider,
-      std::unique_ptr<BeginFrameSource> external_begin_frame_source);
-
-  ~ProxyImpl() override;
-
-  // Virtual for testing.
-  virtual void UpdateTopControlsStateOnImpl(TopControlsState constraints,
-                                            TopControlsState current,
-                                            bool animate);
-  virtual void InitializeOutputSurfaceOnImpl(OutputSurface* output_surface);
-  virtual void InitializeMutatorOnImpl(
-      std::unique_ptr<LayerTreeMutator> mutator);
-  virtual void MainThreadHasStoppedFlingingOnImpl();
-  virtual void SetInputThrottledUntilCommitOnImpl(bool is_throttled);
-  virtual void SetDeferCommitsOnImpl(bool defer_commits) const;
-  virtual void SetNeedsRedrawOnImpl(const gfx::Rect& damage_rect);
-  virtual void SetNeedsCommitOnImpl();
-  virtual void BeginMainFrameAbortedOnImpl(
-      CommitEarlyOutReason reason,
-      base::TimeTicks main_thread_start_time);
-  virtual void FinishAllRenderingOnImpl(CompletionEvent* completion);
-  virtual void SetVisibleOnImpl(bool visible);
-  virtual void ReleaseOutputSurfaceOnImpl(CompletionEvent* completion);
-  virtual void FinishGLOnImpl(CompletionEvent* completion);
-  virtual void StartCommitOnImpl(CompletionEvent* completion,
-                                 LayerTreeHost* layer_tree_host,
-                                 base::TimeTicks main_thread_start_time,
-                                 bool hold_commit_for_activation);
-
-  void MainFrameWillHappenOnImplForTesting(CompletionEvent* completion,
-                                           bool* main_frame_will_happen);
-  void BlockNotifyReadyToActivateForTesting(bool block);
-  CompletionEvent* ActivationCompletionEventForTesting();
-
- protected:
-  // protected for testing.
   ProxyImpl(ChannelImpl* channel_impl,
             LayerTreeHost* layer_tree_host,
             TaskRunnerProvider* task_runner_provider,
             std::unique_ptr<BeginFrameSource> external_begin_frame_source);
+  ~ProxyImpl() override;
+
+  // Virtual for testing.
+  void UpdateTopControlsStateOnImpl(TopControlsState constraints,
+                                    TopControlsState current,
+                                    bool animate);
+  void InitializeOutputSurfaceOnImpl(OutputSurface* output_surface);
+  void InitializeMutatorOnImpl(std::unique_ptr<LayerTreeMutator> mutator);
+  void MainThreadHasStoppedFlingingOnImpl();
+  void SetInputThrottledUntilCommitOnImpl(bool is_throttled);
+  void SetDeferCommitsOnImpl(bool defer_commits) const;
+  void SetNeedsRedrawOnImpl(const gfx::Rect& damage_rect);
+  void SetNeedsCommitOnImpl();
+  void BeginMainFrameAbortedOnImpl(CommitEarlyOutReason reason,
+                                   base::TimeTicks main_thread_start_time);
+  void FinishAllRenderingOnImpl(CompletionEvent* completion);
+  void SetVisibleOnImpl(bool visible);
+  void ReleaseOutputSurfaceOnImpl(CompletionEvent* completion);
+  void FinishGLOnImpl(CompletionEvent* completion);
+  void StartCommitOnImpl(CompletionEvent* completion,
+                         LayerTreeHost* layer_tree_host,
+                         base::TimeTicks main_thread_start_time,
+                         bool hold_commit_for_activation);
+
+  void MainFrameWillHappenOnImplForTesting(CompletionEvent* completion,
+                                           bool* main_frame_will_happen);
 
  private:
   // The members of this struct should be accessed on the impl thread only when
   // the main thread is blocked for a commit.
   struct BlockedMainCommitOnly {
     BlockedMainCommitOnly();
     ~BlockedMainCommitOnly();
     LayerTreeHost* layer_tree_host;
   };
 
-  friend class ProxyImplForTest;
-
   // LayerTreeHostImplClient implementation
   void UpdateRendererCapabilitiesOnImplThread() override;
   void DidLoseOutputSurfaceOnImplThread() override;
   void CommitVSyncParameters(base::TimeTicks timebase,
                              base::TimeDelta interval) override;
   void SetBeginFrameSource(BeginFrameSource* source) override;
   void SetEstimatedParentDrawTime(base::TimeDelta draw_time) override;
   void DidSwapBuffersCompleteOnImplThread() override;
   void OnCanDrawStateChanged(bool can_draw) override;
   void NotifyReadyToActivate() override;
@@ skipping 74 matching lines @@
   // Use accessors instead of this variable directly.
   BlockedMainCommitOnly main_thread_blocked_commit_vars_unsafe_;
   BlockedMainCommitOnly& blocked_main_commit();
 
   DISALLOW_COPY_AND_ASSIGN(ProxyImpl);
 };
 
 }  // namespace cc
 
 #endif  // CC_TREES_PROXY_IMPL_H_