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}

4 files changed, 14 insertions, 22 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();