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

chrome/browser/media_galleries/fileapi/picasa_data_provider.cc

 // 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.
 
 #include "chrome/browser/media_galleries/fileapi/picasa_data_provider.h"
 
 #include <utility>
 
 #include "base/bind_helpers.h"
 #include "base/callback.h"
@@ skipping 67 matching lines @@
     }
     albums_index_ready_callbacks_.push_back(ready_callback);
   }
   DoRefreshIfNecessary();
 }
 
 std::unique_ptr<AlbumMap> PicasaDataProvider::GetFolders() {
   MediaFileSystemBackend::AssertCurrentlyOnMediaSequence();
   DCHECK(state_ == LIST_OF_ALBUMS_AND_FOLDERS_FRESH_STATE ||
          state_ == ALBUMS_IMAGES_FRESH_STATE);
-  return base::WrapUnique(new AlbumMap(folder_map_));
+  return base::MakeUnique<AlbumMap>(folder_map_);
 }
 
 std::unique_ptr<AlbumMap> PicasaDataProvider::GetAlbums() {
   MediaFileSystemBackend::AssertCurrentlyOnMediaSequence();
   DCHECK(state_ == LIST_OF_ALBUMS_AND_FOLDERS_FRESH_STATE ||
          state_ == ALBUMS_IMAGES_FRESH_STATE);
-  return base::WrapUnique(new AlbumMap(album_map_));
+  return base::MakeUnique<AlbumMap>(album_map_);
 }
 
 std::unique_ptr<AlbumImages> PicasaDataProvider::FindAlbumImages(
     const std::string& key,
     base::File::Error* error) {
   MediaFileSystemBackend::AssertCurrentlyOnMediaSequence();
   DCHECK(state_ == ALBUMS_IMAGES_FRESH_STATE);
   DCHECK(error);
 
   AlbumImagesMap::const_iterator it = albums_images_.find(key);
 
   if (it == albums_images_.end()) {
     *error = base::File::FILE_ERROR_NOT_FOUND;
     return std::unique_ptr<AlbumImages>();
   }
 
   *error = base::File::FILE_OK;
-  return base::WrapUnique(new AlbumImages(it->second));
+  return base::MakeUnique<AlbumImages>(it->second);
 }
 
 void PicasaDataProvider::InvalidateData() {
   MediaFileSystemBackend::AssertCurrentlyOnMediaSequence();
 
   // Set data state to stale and ignore responses from any in-flight processes.
   // TODO(tommycli): Implement and call Cancel function for these
   // UtilityProcessHostClients to actually kill the in-flight processes.
   state_ = STALE_DATA_STATE;
   album_table_reader_ = NULL;
@@ skipping 134 matching lines @@
     if (total_counts[name] != 1) {
       name = base::StringPrintf("%s (%d)", name.c_str(),
                                 ++current_counts[name]);
     }
 
     result_map->insert(std::pair<std::string, AlbumInfo>(name, info_list[i]));
   }
 }
 
 }  // namespace picasa