Update from https://crrev.com/316786

cc/resources/pixel_buffer_tile_task_worker_pool.h

 // Copyright 2013 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_PIXEL_BUFFER_TILE_TASK_WORKER_POOL_H_
 #define CC_RESOURCES_PIXEL_BUFFER_TILE_TASK_WORKER_POOL_H_
 
 #include <deque>
 #include <vector>
 
 #include "base/memory/weak_ptr.h"
 #include "base/values.h"
 #include "cc/base/delayed_unique_notifier.h"
 #include "cc/output/context_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 ResourceProvider;
 
 class CC_EXPORT PixelBufferTileTaskWorkerPool : public TileTaskWorkerPool,
                                                 public TileTaskRunner,
                                                 public TileTaskClient {
  public:
   ~PixelBufferTileTaskWorkerPool() override;
 
@@ skipping 53 matching lines @@
   void OnTaskSetFinished(TaskSet task_set);
   void FlushUploads();
   void CheckForCompletedUploads();
   void CheckForCompletedRasterTasks();
   void ScheduleMoreTasks();
   unsigned PendingRasterTaskCount() const;
   TaskSetCollection PendingTasks() const;
   void CheckForCompletedRasterizerTasks();
 
   const char* StateName() const;
-  scoped_refptr<base::debug::ConvertableToTraceFormat> StateAsValue() const;
-  void ThrottleStateAsValueInto(base::debug::TracedValue* throttle_state) const;
+  scoped_refptr<base::trace_event::ConvertableToTraceFormat> StateAsValue()
+      const;
+  void ThrottleStateAsValueInto(
+      base::trace_event::TracedValue* throttle_state) const;
 
   scoped_refptr<base::SequencedTaskRunner> task_runner_;
   TaskGraphRunner* task_graph_runner_;
   const NamespaceToken namespace_token_;
   TileTaskRunnerClient* client_;
   ContextProvider* context_provider_;
   ResourceProvider* resource_provider_;
 
   bool shutdown_;
 
@@ skipping 23 matching lines @@
 
   base::WeakPtrFactory<PixelBufferTileTaskWorkerPool>
       task_set_finished_weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PixelBufferTileTaskWorkerPool);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_PIXEL_BUFFER_TILE_TASK_WORKER_POOL_H_