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

chrome/browser/android/compositor/tab_content_manager.cc

 // Copyright 2014 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/android/compositor/tab_content_manager.h"
 
 #include <android/bitmap.h>
 #include <stddef.h>
 
 #include <utility>
@@ skipping 94 matching lines @@
 }
 
 TabContentManager::TabContentManager(JNIEnv* env,
                                      jobject obj,
                                      jint default_cache_size,
                                      jint approximation_cache_size,
                                      jint compression_queue_max_size,
                                      jint write_queue_max_size,
                                      jboolean use_approximation_thumbnail)
     : weak_java_tab_content_manager_(env, obj), weak_factory_(this) {
-  thumbnail_cache_ = base::WrapUnique(new ThumbnailCache(
+  thumbnail_cache_ = base::MakeUnique<ThumbnailCache>(
       (size_t)default_cache_size, (size_t)approximation_cache_size,

[sky, 2016/09/12 17:13:36]

Fix these too static_cast?

[Adam Rice, 2016/09/13 03:02:49]

I was trying to pretend I hadn't seen those. Fixed.

       (size_t)compression_queue_max_size, (size_t)write_queue_max_size,
-      use_approximation_thumbnail));
+      use_approximation_thumbnail);
   thumbnail_cache_->AddThumbnailCacheObserver(this);
 }
 
 TabContentManager::~TabContentManager() {
 }
 
 void TabContentManager::Destroy(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   thumbnail_cache_->RemoveThumbnailCacheObserver(this);
   delete this;
 }
@@ skipping 101 matching lines @@
         pending_tab_readbacks_.find(tab_id) != pending_tab_readbacks_.end() ||
         pending_tab_readbacks_.size() >= kMaxReadbacks) {
       thumbnail_cache_->Remove(tab_id);
       return;
     }
 
     TabReadbackCallback readback_done_callback =
         base::Bind(&TabContentManager::PutThumbnailIntoCache,
                    weak_factory_.GetWeakPtr(), tab_id);
     pending_tab_readbacks_.set(
-        tab_id, base::WrapUnique(new TabReadbackRequest(
-                    web_contents, thumbnail_scale, readback_done_callback)));
+        tab_id, base::MakeUnique<TabReadbackRequest>(
+                    web_contents, thumbnail_scale, readback_done_callback));
   }
 }
 
 void TabContentManager::CacheTabWithBitmap(JNIEnv* env,
                                            const JavaParamRef<jobject>& obj,
                                            const JavaParamRef<jobject>& tab,
                                            const JavaParamRef<jobject>& bitmap,
                                            jfloat thumbnail_scale) {
   TabAndroid* tab_android = TabAndroid::GetNativeTab(env, tab);
   DCHECK(tab_android);
@@ skipping 91 matching lines @@
            jboolean use_approximation_thumbnail) {
   TabContentManager* manager = new TabContentManager(
       env, obj, default_cache_size, approximation_cache_size,
       compression_queue_max_size, write_queue_max_size,
       use_approximation_thumbnail);
   return reinterpret_cast<intptr_t>(manager);
 }
 
 }  // namespace android
 }  // namespace chrome