Update from https://crrev.com/316786

cc/resources/one_copy_tile_task_worker_pool.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 CC_RESOURCES_ONE_COPY_TILE_TASK_WORKER_POOL_H_
 #define CC_RESOURCES_ONE_COPY_TILE_TASK_WORKER_POOL_H_
 
 #include "base/memory/weak_ptr.h"
 #include "base/synchronization/lock.h"
 #include "base/values.h"
 #include "cc/base/scoped_ptr_deque.h"
 #include "cc/output/context_provider.h"
 #include "cc/resources/resource_provider.h"
 #include "cc/resources/tile_task_runner.h"
 #include "cc/resources/tile_task_worker_pool.h"
 
 namespace base {
 namespace trace_event {
 class ConvertableToTraceFormat;
 class TracedValue;
 }
-
-// TODO(ssid): remove these aliases after the tracing clients are moved to the
-// new trace_event namespace. See crbug.com/451032. ETA: March 2015
-namespace debug {
-using ::base::trace_event::ConvertableToTraceFormat;
-using ::base::trace_event::TracedValue;
 }
-}  // namespace base
 
 namespace cc {
 class ResourcePool;
 class ScopedResource;
 
 typedef int64 CopySequenceNumber;
 
 class CC_EXPORT OneCopyTileTaskWorkerPool : public TileTaskWorkerPool,
                                             public TileTaskRunner,
                                             public TileTaskClient {
@@ skipping 57 matching lines @@
     scoped_ptr<ScopedResource> src;
     const Resource* dst;
   };
 
   void OnTaskSetFinished(TaskSet task_set);
   void AdvanceLastFlushedCopyTo(CopySequenceNumber sequence);
   void IssueCopyOperations(int64 count);
   void ScheduleCheckForCompletedCopyOperationsWithLockAcquired(
       bool wait_if_needed);
   void CheckForCompletedCopyOperations(bool wait_if_needed);
-  scoped_refptr<base::debug::ConvertableToTraceFormat> StateAsValue() const;
-  void StagingStateAsValueInto(base::debug::TracedValue* staging_state) const;
+  scoped_refptr<base::trace_event::ConvertableToTraceFormat> StateAsValue()
+      const;
+  void StagingStateAsValueInto(
+      base::trace_event::TracedValue* staging_state) const;
 
   scoped_refptr<base::SequencedTaskRunner> task_runner_;
   TaskGraphRunner* task_graph_runner_;
   const NamespaceToken namespace_token_;
   TileTaskRunnerClient* client_;
   ContextProvider* context_provider_;
   ResourceProvider* resource_provider_;
   ResourcePool* resource_pool_;
   TaskSetCollection tasks_pending_;
   scoped_refptr<TileTask> task_set_finished_tasks_[kNumberOfTaskSets];
@@ skipping 21 matching lines @@
   // canceled when ScheduleTasks() is called.
   base::WeakPtrFactory<OneCopyTileTaskWorkerPool>
       task_set_finished_weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(OneCopyTileTaskWorkerPool);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_ONE_COPY_TILE_TASK_WORKER_POOL_H_