cc: Clean up LayerTreeTest and TestHooks.

cc/trees/proxy_main.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_MAIN_H_
 #define CC_TREES_PROXY_MAIN_H_
 
 #include "base/macros.h"
 #include "cc/base/cc_export.h"
 #include "cc/input/top_controls_state.h"
@@ skipping 31 matching lines @@
   // Commits between the main and impl threads are processed through a pipeline
   // with the following stages. For efficiency we can early out at any stage if
   // we decide that no further processing is necessary.
   enum CommitPipelineStage {
     NO_PIPELINE_STAGE,
     ANIMATE_PIPELINE_STAGE,
     UPDATE_LAYERS_PIPELINE_STAGE,
     COMMIT_PIPELINE_STAGE,
   };
 
-  // Virtual for testing.
-  virtual void DidCompleteSwapBuffers();
-  virtual void SetRendererCapabilities(
-      const RendererCapabilities& capabilities);
-  virtual void BeginMainFrameNotExpectedSoon();
-  virtual void DidCommitAndDrawFrame();
-  virtual void SetAnimationEvents(std::unique_ptr<AnimationEvents> events);
-  virtual void DidLoseOutputSurface();
-  virtual void RequestNewOutputSurface();
-  virtual void DidInitializeOutputSurface(
-      bool success,
-      const RendererCapabilities& capabilities);
-  virtual void DidCompletePageScaleAnimation();
-  virtual void BeginMainFrame(
+  void DidCompleteSwapBuffers();
+  void SetRendererCapabilities(const RendererCapabilities& capabilities);
+  void BeginMainFrameNotExpectedSoon();
+  void DidCommitAndDrawFrame();
+  void SetAnimationEvents(std::unique_ptr<AnimationEvents> events);
+  void DidLoseOutputSurface();
+  void RequestNewOutputSurface();
+  void DidInitializeOutputSurface(bool success,
+                                  const RendererCapabilities& capabilities);
+  void DidCompletePageScaleAnimation();
+  void BeginMainFrame(
       std::unique_ptr<BeginMainFrameAndCommitState> begin_main_frame_state);
 
   ChannelMain* channel_main() const { return channel_main_.get(); }
   CommitPipelineStage max_requested_pipeline_stage() const {
     return max_requested_pipeline_stage_;
   }
   CommitPipelineStage current_pipeline_stage() const {
     return current_pipeline_stage_;
   }
   CommitPipelineStage final_pipeline_stage() const {
@@ skipping 71 matching lines @@
   RendererCapabilities renderer_capabilities_;
 
   std::unique_ptr<ChannelMain> channel_main_;
 
   DISALLOW_COPY_AND_ASSIGN(ProxyMain);
 };
 
 }  // namespace cc
 
 #endif  // CC_TREES_PROXY_MAIN_H_