Fix unused variables errors in cc/.

This needed in order to use "= delete" for DISALLOW_COPY_AND_ASSIGN.

BUG=447445
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel

Review URL: https://codereview.chromium.org/1222243005

Cr-Commit-Position: refs/heads/master@{#337484}

10 files changed, 20 insertions, 37 deletions

diff --git a/cc/animation/animation_host.cc b/cc/animation/animation_host.cc
index 489c6f8..82a5e72 100644
--- a/cc/animation/animation_host.cc
+++ b/cc/animation/animation_host.cc
@@ -14,15 +14,13 @@
 
 namespace cc {
 
-scoped_ptr<AnimationHost> AnimationHost::Create(
-    ThreadInstance thread_instance) {
-  return make_scoped_ptr(new AnimationHost(thread_instance));
+scoped_ptr<AnimationHost> AnimationHost::Create() {
+  return make_scoped_ptr(new AnimationHost);
 }
 
-AnimationHost::AnimationHost(ThreadInstance thread_instance)
+AnimationHost::AnimationHost()
     : animation_registrar_(AnimationRegistrar::Create()),
-      mutator_host_client_(),
-      thread_instance_(thread_instance) {
+      mutator_host_client_(nullptr) {
 }
 
 AnimationHost::~AnimationHost() {
diff --git a/cc/animation/animation_host.h b/cc/animation/animation_host.h
index 2887ad8..294c795 100644
--- a/cc/animation/animation_host.h
+++ b/cc/animation/animation_host.h
@@ -40,7 +40,7 @@ typedef std::vector<scoped_refptr<AnimationTimeline>> AnimationTimelineList;
 // we want to merge AnimationRegistrar into AnimationHost.
 class CC_EXPORT AnimationHost {
  public:
-  static scoped_ptr<AnimationHost> Create(ThreadInstance thread_instance);
+  static scoped_ptr<AnimationHost> Create();
   virtual ~AnimationHost();
 
   void AddAnimationTimeline(scoped_refptr<AnimationTimeline> timeline);
@@ -121,7 +121,7 @@ class CC_EXPORT AnimationHost {
   bool HasActiveAnimation(int layer_id) const;
 
  private:
-  explicit AnimationHost(ThreadInstance thread_instance);
+  AnimationHost();
 
   void PushTimelinesToImplThread(AnimationHost* host_impl) const;
   void RemoveTimelinesFromImplThread(AnimationHost* host_impl) const;
@@ -141,8 +141,6 @@ class CC_EXPORT AnimationHost {
   scoped_ptr<AnimationRegistrar> animation_registrar_;
   MutatorHostClient* mutator_host_client_;
 
-  const ThreadInstance thread_instance_;
-
   DISALLOW_COPY_AND_ASSIGN(AnimationHost);
 };
 
diff --git a/cc/animation/animation_host_unittest.cc b/cc/animation/animation_host_unittest.cc
index 18d6c9f..8abbd8fb 100644
--- a/cc/animation/animation_host_unittest.cc
+++ b/cc/animation/animation_host_unittest.cc
@@ -17,9 +17,8 @@ namespace {
 // animation_player_unittest.cc.
 
 TEST(AnimationHostTest, SyncTimelinesAddRemove) {
-  scoped_ptr<AnimationHost> host(AnimationHost::Create(ThreadInstance::MAIN));
-  scoped_ptr<AnimationHost> host_impl(
-      AnimationHost::Create(ThreadInstance::IMPL));
+  scoped_ptr<AnimationHost> host(AnimationHost::Create());
+  scoped_ptr<AnimationHost> host_impl(AnimationHost::Create());
 
   const int timeline_id = AnimationIdProvider::NextTimelineId();
   scoped_refptr<AnimationTimeline> timeline(
@@ -49,9 +48,8 @@ TEST(AnimationHostTest, SyncTimelinesAddRemove) {
 }
 
 TEST(AnimationHostTest, ImplOnlyTimeline) {
-  scoped_ptr<AnimationHost> host(AnimationHost::Create(ThreadInstance::MAIN));
-  scoped_ptr<AnimationHost> host_impl(
-      AnimationHost::Create(ThreadInstance::IMPL));
+  scoped_ptr<AnimationHost> host(AnimationHost::Create());
+  scoped_ptr<AnimationHost> host_impl(AnimationHost::Create());
 
   const int timeline_id1 = AnimationIdProvider::NextTimelineId();
   const int timeline_id2 = AnimationIdProvider::NextTimelineId();
diff --git a/cc/animation/animation_timeline_unittest.cc b/cc/animation/animation_timeline_unittest.cc
index 3b0bc5a..a4b6620 100644
--- a/cc/animation/animation_timeline_unittest.cc
+++ b/cc/animation/animation_timeline_unittest.cc
@@ -15,9 +15,8 @@ namespace cc {
 namespace {
 
 TEST(AnimationTimelineTest, SyncPlayersAttachDetach) {
-  scoped_ptr<AnimationHost> host(AnimationHost::Create(ThreadInstance::MAIN));
-  scoped_ptr<AnimationHost> host_impl(
-      AnimationHost::Create(ThreadInstance::IMPL));
+  scoped_ptr<AnimationHost> host(AnimationHost::Create());
+  scoped_ptr<AnimationHost> host_impl(AnimationHost::Create());
 
   const int timeline_id = AnimationIdProvider::NextTimelineId();
   const int player_id = AnimationIdProvider::NextPlayerId();
@@ -60,9 +59,8 @@ TEST(AnimationTimelineTest, SyncPlayersAttachDetach) {
 }
 
 TEST(AnimationTimelineTest, ClearPlayers) {
-  scoped_ptr<AnimationHost> host(AnimationHost::Create(ThreadInstance::MAIN));
-  scoped_ptr<AnimationHost> host_impl(
-      AnimationHost::Create(ThreadInstance::IMPL));
+  scoped_ptr<AnimationHost> host(AnimationHost::Create());
+  scoped_ptr<AnimationHost> host_impl(AnimationHost::Create());
 
   const int timeline_id = AnimationIdProvider::NextTimelineId();
   const int player_id1 = AnimationIdProvider::NextPlayerId();
diff --git a/cc/layers/render_surface.h b/cc/layers/render_surface.h
index 32276b6..29401e2 100644
--- a/cc/layers/render_surface.h
+++ b/cc/layers/render_surface.h
@@ -140,10 +140,6 @@ class CC_EXPORT RenderSurface {
   // surface, and that ignores outside occlusion. This can point to itself.
   RenderSurface* nearest_occlusion_immune_ancestor_;
 
-  // For LayerIteratorActions
-  int target_render_surface_layer_index_history_;
-  size_t current_layer_index_history_;
-
   DISALLOW_COPY_AND_ASSIGN(RenderSurface);
 };
 
diff --git a/cc/raster/gpu_tile_task_worker_pool.cc b/cc/raster/gpu_tile_task_worker_pool.cc
index f2806c4..7c21177 100644
--- a/cc/raster/gpu_tile_task_worker_pool.cc
+++ b/cc/raster/gpu_tile_task_worker_pool.cc
@@ -29,7 +29,6 @@ class RasterBufferImpl : public RasterBuffer {
                    uint64_t previous_content_id)
       : rasterizer_(rasterizer),
         lock_(rasterizer->resource_provider(), resource->id()),
-        resource_(resource),
         resource_has_previous_content_(
             resource_content_id && resource_content_id == previous_content_id) {
   }
@@ -74,7 +73,6 @@ class RasterBufferImpl : public RasterBuffer {
  private:
   GpuRasterizer* rasterizer_;
   ResourceProvider::ScopedWriteLockGr lock_;
-  const Resource* resource_;
   bool resource_has_previous_content_;
 
   DISALLOW_COPY_AND_ASSIGN(RasterBufferImpl);
diff --git a/cc/test/animation_timelines_test_common.cc b/cc/test/animation_timelines_test_common.cc
index ea9d0b0..5789e87 100644
--- a/cc/test/animation_timelines_test_common.cc
+++ b/cc/test/animation_timelines_test_common.cc
@@ -35,9 +35,8 @@ void TestLayer::ClearMutatedProperties() {
     mutated_properties_[i] = false;
 }
 
-TestHostClient::TestHostClient(ThreadInstance thread_instance)
-    : host_(AnimationHost::Create(thread_instance)),
-      mutators_need_commit_(false) {
+TestHostClient::TestHostClient()
+    : host_(AnimationHost::Create()), mutators_need_commit_(false) {
   host_->SetMutatorHostClient(this);
 }
 
@@ -193,9 +192,7 @@ void TestAnimationDelegate::NotifyAnimationFinished(
 }
 
 AnimationTimelinesTest::AnimationTimelinesTest()
-    : client_(ThreadInstance::MAIN),
-      client_impl_(ThreadInstance::IMPL),
-      timeline_id_(AnimationIdProvider::NextTimelineId()),
+    : timeline_id_(AnimationIdProvider::NextTimelineId()),
       player_id_(AnimationIdProvider::NextPlayerId()),
       layer_id_(1) {
   host_ = client_.host();
diff --git a/cc/test/animation_timelines_test_common.h b/cc/test/animation_timelines_test_common.h
index e28926c..e17d9e5 100644
--- a/cc/test/animation_timelines_test_common.h
+++ b/cc/test/animation_timelines_test_common.h
@@ -68,7 +68,7 @@ class TestLayer {
 
 class TestHostClient : public MutatorHostClient {
  public:
-  explicit TestHostClient(ThreadInstance thread_instance);
+  TestHostClient();
   ~TestHostClient();
 
   void ClearMutatedProperties();
diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc
index 62d730b..f0236dd 100644
--- a/cc/trees/layer_tree_host.cc
+++ b/cc/trees/layer_tree_host.cc
@@ -124,7 +124,7 @@ LayerTreeHost::LayerTreeHost(InitParams* params)
 
   if (settings_.accelerated_animation_enabled) {
     if (settings_.use_compositor_animation_timelines) {
-      animation_host_ = AnimationHost::Create(ThreadInstance::MAIN);
+      animation_host_ = AnimationHost::Create();
       animation_host_->SetMutatorHostClient(this);
     } else {
       animation_registrar_ = AnimationRegistrar::Create();
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
index d403004..b549322 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -242,7 +242,7 @@ LayerTreeHostImpl::LayerTreeHostImpl(
       frame_timing_tracker_(FrameTimingTracker::Create(this)) {
   if (settings.use_compositor_animation_timelines) {
     if (settings.accelerated_animation_enabled) {
-      animation_host_ = AnimationHost::Create(ThreadInstance::IMPL);
+      animation_host_ = AnimationHost::Create();
       animation_host_->SetMutatorHostClient(this);
       animation_host_->SetSupportsScrollAnimations(
           proxy_->SupportsImplScrolling());