Re-write many calls to WrapUnique() with MakeUnique()

components/drive/chromeos/change_list_loader.cc

 // Copyright (c) 2012 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.
 
 #include "components/drive/chromeos/change_list_loader.h"
 
 #include <stddef.h>
 
 #include <set>
 #include <utility>
@@ skipping 163 matching lines @@
 }
 
 LoaderController::~LoaderController() {
   DCHECK(thread_checker_.CalledOnValidThread());
 }
 
 std::unique_ptr<base::ScopedClosureRunner> LoaderController::GetLock() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   ++lock_count_;
-  return base::WrapUnique(new base::ScopedClosureRunner(
-      base::Bind(&LoaderController::Unlock, weak_ptr_factory_.GetWeakPtr())));
+  return base::MakeUnique<base::ScopedClosureRunner>(
+      base::Bind(&LoaderController::Unlock, weak_ptr_factory_.GetWeakPtr()));
 }
 
 void LoaderController::ScheduleRun(const base::Closure& task) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(!task.is_null());
 
   if (lock_count_ > 0) {
     pending_tasks_.push_back(task);
   } else {
     task.Run();
@@ skipping 80 matching lines @@
       cached_about_resource_->largest_change_id() >
       about_resource->largest_change_id()) {
     LOG(WARNING) << "Local cached about resource is fresher than server, "
                  << "local = " << cached_about_resource_->largest_change_id()
                  << ", server = " << about_resource->largest_change_id();
   }
   cached_about_resource_.reset(new google_apis::AboutResource(*about_resource));
 
   for (size_t i = 0; i < callbacks.size(); ++i) {
     callbacks[i].Run(
-        status,
-        base::WrapUnique(new google_apis::AboutResource(*about_resource)));
+        status, base::MakeUnique<google_apis::AboutResource>(*about_resource));
   }
 }
 
 ChangeListLoader::ChangeListLoader(
     EventLogger* logger,
     base::SequencedTaskRunner* blocking_task_runner,
     ResourceMetadata* resource_metadata,
     JobScheduler* scheduler,
     AboutResourceLoader* about_resource_loader,
     LoaderController* loader_controller)
@@ skipping 207 matching lines @@
         new DeltaFeedFetcher(scheduler_, start_changestamp));
   } else {
     change_feed_fetcher_.reset(new FullFeedFetcher(scheduler_));
   }
 
   // Make a copy of cached_about_resource_ to remember at which changestamp we
   // are fetching change list.
   change_feed_fetcher_->Run(
       base::Bind(&ChangeListLoader::LoadChangeListFromServerAfterLoadChangeList,
                  weak_ptr_factory_.GetWeakPtr(),
-                 base::Passed(base::WrapUnique(new google_apis::AboutResource(
-                     *about_resource_loader_->cached_about_resource()))),
+                 base::Passed(base::MakeUnique<google_apis::AboutResource>(
+                     *about_resource_loader_->cached_about_resource())),
                  is_delta_update));
 }
 
 void ChangeListLoader::LoadChangeListFromServerAfterLoadChangeList(
     std::unique_ptr<google_apis::AboutResource> about_resource,
     bool is_delta_update,
     FileError error,
     ScopedVector<ChangeList> change_lists) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(about_resource);
@@ skipping 49 matching lines @@
 
   OnChangeListLoadComplete(error);
 
   FOR_EACH_OBSERVER(ChangeListLoaderObserver,
                     observers_,
                     OnLoadFromServerComplete());
 }
 
 }  // namespace internal
 }  // namespace drive