Convert Pass()→std::move() in //chrome (Android edition)

chrome/browser/android/thumbnail/thumbnail_cache.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/thumbnail/thumbnail_cache.h"
 
 #include <algorithm>
 #include <cmath>
+#include <utility>
 
 #include "base/android/path_utils.h"
 #include "base/big_endian.h"
 #include "base/files/file.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/threading/worker_pool.h"
 #include "base/time/time.h"
@@ skipping 147 matching lines @@
 
   DCHECK(thumbnail_meta_data_.find(tab_id) != thumbnail_meta_data_.end());
 
   base::Time time_stamp = thumbnail_meta_data_[tab_id].capture_time();
   scoped_ptr<Thumbnail> thumbnail = Thumbnail::Create(
       tab_id, time_stamp, thumbnail_scale, ui_resource_provider_, this);
   thumbnail->SetBitmap(bitmap);
 
   RemoveFromReadQueue(tab_id);
   MakeSpaceForNewItemIfNecessary(tab_id);
-  cache_.Put(tab_id, thumbnail.Pass());
+  cache_.Put(tab_id, std::move(thumbnail));
 
   if (use_approximation_thumbnail_) {
     std::pair<SkBitmap, float> approximation =
         CreateApproximation(bitmap, thumbnail_scale);
     scoped_ptr<Thumbnail> approx_thumbnail = Thumbnail::Create(
         tab_id, time_stamp, approximation.second, ui_resource_provider_, this);
     approx_thumbnail->SetBitmap(approximation.first);
-    approximation_cache_.Put(tab_id, approx_thumbnail.Pass());
+    approximation_cache_.Put(tab_id, std::move(approx_thumbnail));
   }
   CompressThumbnailIfNecessary(tab_id, time_stamp, bitmap, thumbnail_scale);
 }
 
 void ThumbnailCache::Remove(TabId tab_id) {
   cache_.Remove(tab_id);
   approximation_cache_.Remove(tab_id);
   thumbnail_meta_data_.erase(tab_id);
   RemoveFromDisk(tab_id);
   RemoveFromReadQueue(tab_id);
@@ skipping 622 matching lines @@
       time_stamp = meta_iter->second.capture_time();
 
     MakeSpaceForNewItemIfNecessary(tab_id);
     scoped_ptr<Thumbnail> thumbnail = Thumbnail::Create(
         tab_id, time_stamp, scale, ui_resource_provider_, this);
     thumbnail->SetCompressedBitmap(compressed_data,
                                    content_size);
     if (kPreferCPUMemory)
       thumbnail->CreateUIResource();
 
-    cache_.Put(tab_id, thumbnail.Pass());
+    cache_.Put(tab_id, std::move(thumbnail));
     NotifyObserversOfThumbnailRead(tab_id);
   }
 
   ReadNextThumbnail();
 }
 
 void ThumbnailCache::NotifyObserversOfThumbnailRead(TabId tab_id) {
   FOR_EACH_OBSERVER(
       ThumbnailCacheObserver, observers_, OnFinishedThumbnailRead(tab_id));
 }
@@ skipping 92 matching lines @@
   dst_bitmap.eraseColor(0);
   SkAutoLockPixels dst_bitmap_lock(dst_bitmap);
 
   SkCanvas canvas(dst_bitmap);
   canvas.scale(new_scale, new_scale);
   canvas.drawBitmap(bitmap, 0, 0, NULL);
   dst_bitmap.setImmutable();
 
   return std::make_pair(dst_bitmap, new_scale * scale);
 }