| Index: chrome/browser/chromeos/drive/debug_info_collector.cc | 
| diff --git a/chrome/browser/chromeos/drive/debug_info_collector.cc b/chrome/browser/chromeos/drive/debug_info_collector.cc | 
| index 81221f7dcee1431c7b0b7ac3e4bfd634d6b4703a..bfbb7a5a02521c9b80d8df02993d80993b27d5db 100644 | 
| --- a/chrome/browser/chromeos/drive/debug_info_collector.cc | 
| +++ b/chrome/browser/chromeos/drive/debug_info_collector.cc | 
| @@ -17,7 +17,8 @@ namespace { | 
| void IterateFileCacheInternal( | 
| internal::ResourceMetadata* metadata, | 
| const DebugInfoCollector::IterateFileCacheCallback& iteration_callback) { | 
| -  scoped_ptr<internal::ResourceMetadata::Iterator> it = metadata->GetIterator(); | 
| +  std::unique_ptr<internal::ResourceMetadata::Iterator> it = | 
| +      metadata->GetIterator(); | 
| for (; !it->IsAtEnd(); it->Advance()) { | 
| if (it->GetValue().file_specific_info().has_cache_state()) { | 
| iteration_callback.Run(it->GetID(), | 
| @@ -29,7 +30,7 @@ void IterateFileCacheInternal( | 
|  | 
| // Runs the callback with arguments. | 
| void RunGetResourceEntryCallback(const GetResourceEntryCallback& callback, | 
| -                                 scoped_ptr<ResourceEntry> entry, | 
| +                                 std::unique_ptr<ResourceEntry> entry, | 
| FileError error) { | 
| DCHECK(!callback.is_null()); | 
| if (error != FILE_ERROR_OK) | 
| @@ -40,7 +41,7 @@ void RunGetResourceEntryCallback(const GetResourceEntryCallback& callback, | 
| // Runs the callback with arguments. | 
| void RunReadDirectoryCallback( | 
| const DebugInfoCollector::ReadDirectoryCallback& callback, | 
| -    scoped_ptr<ResourceEntryVector> entries, | 
| +    std::unique_ptr<ResourceEntryVector> entries, | 
| FileError error) { | 
| DCHECK(!callback.is_null()); | 
| if (error != FILE_ERROR_OK) | 
| @@ -70,7 +71,7 @@ void DebugInfoCollector::GetResourceEntry( | 
| DCHECK(thread_checker_.CalledOnValidThread()); | 
| DCHECK(!callback.is_null()); | 
|  | 
| -  scoped_ptr<ResourceEntry> entry(new ResourceEntry); | 
| +  std::unique_ptr<ResourceEntry> entry(new ResourceEntry); | 
| ResourceEntry* entry_ptr = entry.get(); | 
| base::PostTaskAndReplyWithResult( | 
| blocking_task_runner_.get(), | 
| @@ -88,7 +89,7 @@ void DebugInfoCollector::ReadDirectory( | 
| DCHECK(thread_checker_.CalledOnValidThread()); | 
| DCHECK(!callback.is_null()); | 
|  | 
| -  scoped_ptr<ResourceEntryVector> entries(new ResourceEntryVector); | 
| +  std::unique_ptr<ResourceEntryVector> entries(new ResourceEntryVector); | 
| ResourceEntryVector* entries_ptr = entries.get(); | 
| base::PostTaskAndReplyWithResult( | 
| blocking_task_runner_.get(), | 
|  |