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

chrome/browser/android/most_visited_sites.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/android/most_visited_sites.h"
 
+#include <utility>
+
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/prefs/pref_service.h"
@@ skipping 69 matching lines @@
 };
 
 scoped_ptr<SkBitmap> MaybeFetchLocalThumbnail(
     const GURL& url,
     const scoped_refptr<TopSites>& top_sites) {
   DCHECK_CURRENTLY_ON(BrowserThread::DB);
   scoped_refptr<base::RefCountedMemory> image;
   scoped_ptr<SkBitmap> bitmap;
   if (top_sites && top_sites->GetPageThumbnail(url, false, &image))
     bitmap.reset(gfx::JPEGCodec::Decode(image->front(), image->size()));
-  return bitmap.Pass();
+  return bitmap;
 }
 
 // Log an event for a given |histogram| at a given element |position|. This
 // routine exists because regular histogram macros are cached thus can't be used
 // if the name of the histogram will change at a given call site.
 void LogHistogramEvent(const std::string& histogram,
                        int position,
                        int num_sites) {
   base::HistogramBase* counter = base::LinearHistogram::FactoryGet(
       histogram,
@@ skipping 217 matching lines @@
         }
       }
       if (mv_source_ == SUGGESTIONS_SERVICE) {
         return suggestions_service->GetPageThumbnail(
             url, base::Bind(&MostVisitedSites::OnObtainedThumbnail,
                             weak_ptr_factory_.GetWeakPtr(), false,
                             base::Passed(&j_callback)));
       }
     }
   }
-  OnObtainedThumbnail(true, j_callback.Pass(), url, bitmap.get());
+  OnObtainedThumbnail(true, std::move(j_callback), url, bitmap.get());
 }
 
 void MostVisitedSites::OnObtainedThumbnail(
     bool is_local_thumbnail,
     scoped_ptr<ScopedJavaGlobalRef<jobject>> j_callback,
     const GURL& url,
     const SkBitmap* bitmap) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> j_bitmap;
@@ skipping 236 matching lines @@
       personal_suggestions, &merged_suggestions, old_sites_url, old_sites_host);
   // Insert popular suggestions if they existed previously.
   std::vector<size_t> new_popular_suggestions = InsertMatchingSuggestions(
       popular_suggestions, &merged_suggestions, old_sites_url, old_sites_host);
   // Insert leftover personal suggestions.
   size_t filled_so_far = InsertAllSuggestions(
       0, new_personal_suggestions, personal_suggestions, &merged_suggestions);
   // Insert leftover popular suggestions.
   InsertAllSuggestions(filled_so_far, new_popular_suggestions,
                        popular_suggestions, &merged_suggestions);
-  return merged_suggestions.Pass();
+  return merged_suggestions;
 }
 
 void MostVisitedSites::GetPreviousNTPSites(
     size_t num_tiles,
     std::vector<std::string>* old_sites_url,
     std::vector<bool>* old_sites_is_personal) const {
   const PrefService* prefs = profile_->GetPrefs();
   const base::ListValue* url_list = prefs->GetList(prefs::kNTPSuggestionsURL);
   const base::ListValue* source_list =
       prefs->GetList(prefs::kNTPSuggestionsIsPersonal);
@@ skipping 154 matching lines @@
   }
 }
 
 static jlong Init(JNIEnv* env,
                   const JavaParamRef<jobject>& obj,
                   const JavaParamRef<jobject>& jprofile) {
   MostVisitedSites* most_visited_sites =
       new MostVisitedSites(ProfileAndroid::FromProfileAndroid(jprofile));
   return reinterpret_cast<intptr_t>(most_visited_sites);
 }