| Index: cc/resources/one_copy_tile_task_worker_pool.cc
 | 
| diff --git a/cc/resources/one_copy_tile_task_worker_pool.cc b/cc/resources/one_copy_tile_task_worker_pool.cc
 | 
| index 23c9538911af4e40e35b272333b10be1ce0bb33b..cee568afa4700c5cc0e61948d7c86cc7af63b17a 100644
 | 
| --- a/cc/resources/one_copy_tile_task_worker_pool.cc
 | 
| +++ b/cc/resources/one_copy_tile_task_worker_pool.cc
 | 
| @@ -467,10 +467,10 @@ void OneCopyTileTaskWorkerPool::CheckForCompletedCopyOperations(
 | 
|    }
 | 
|  }
 | 
|  
 | 
| -scoped_refptr<base::debug::ConvertableToTraceFormat>
 | 
| +scoped_refptr<base::trace_event::ConvertableToTraceFormat>
 | 
|  OneCopyTileTaskWorkerPool::StateAsValue() const {
 | 
| -  scoped_refptr<base::debug::TracedValue> state =
 | 
| -      new base::debug::TracedValue();
 | 
| +  scoped_refptr<base::trace_event::TracedValue> state =
 | 
| +      new base::trace_event::TracedValue();
 | 
|  
 | 
|    state->BeginArray("tasks_pending");
 | 
|    for (TaskSet task_set = 0; task_set < kNumberOfTaskSets; ++task_set)
 | 
| @@ -484,7 +484,7 @@ OneCopyTileTaskWorkerPool::StateAsValue() const {
 | 
|  }
 | 
|  
 | 
|  void OneCopyTileTaskWorkerPool::StagingStateAsValueInto(
 | 
| -    base::debug::TracedValue* staging_state) const {
 | 
| +    base::trace_event::TracedValue* staging_state) const {
 | 
|    staging_state->SetInteger("staging_resource_count",
 | 
|                              resource_pool_->total_resource_count());
 | 
|    staging_state->SetInteger("bytes_used_for_staging_resources",
 | 
| 
 |