Convert Pass()→std::move() in //chrome/browser/ui

chrome/browser/ui/app_list/fast_show_pickler.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/ui/app_list/fast_show_pickler.h"
 
 #include <stddef.h>
+#include <utility>
 
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/app_list/app_list_item.h"
 #include "ui/gfx/image/image_skia_rep.h"
 
 namespace {
 
 using app_list::AppListItem;
 using app_list::AppListModel;
 
@@ skipping 140 matching lines @@
   if (!it->ReadString(&name))
     return scoped_ptr<AppListItem>();
   std::string short_name;
   if (!it->ReadString(&short_name))
     return scoped_ptr<AppListItem>();
   result->SetNameAndShortName(name, short_name);
   gfx::ImageSkia icon;
   if (!UnpickleImage(it, &icon))
     return scoped_ptr<AppListItem>();
   result->SetIcon(icon);
-  return result.Pass();
+  return result;
 }
 
 bool FastShowPickler::PickleAppListItem(base::Pickle* pickle,
                                         AppListItem* item) {
   if (!pickle->WriteString(item->id()))
     return false;
   if (!pickle->WriteString(item->name()))
     return false;
   if (!pickle->WriteString(item->short_name()))
     return false;
@@ skipping 19 matching lines @@
   if (!result->WriteInt(kVersion))
     return scoped_ptr<base::Pickle>();
   if (!result->WriteInt((int)model->top_level_item_list()->item_count()))
     return scoped_ptr<base::Pickle>();
   for (size_t i = 0; i < model->top_level_item_list()->item_count(); ++i) {
     if (!PickleAppListItem(result.get(),
                            model->top_level_item_list()->item_at(i))) {
       return scoped_ptr<base::Pickle>();
     }
   }
-  return result.Pass();
+  return result;
 }
 
 void FastShowPickler::CopyOver(AppListModel* src, AppListModel* dest) {
   DCHECK_EQ(0u, dest->top_level_item_list()->item_count());
   for (size_t i = 0; i < src->top_level_item_list()->item_count(); i++) {
     AppListItem* src_item = src->top_level_item_list()->item_at(i);
     scoped_ptr<AppListItem> dest_item(new AppListItem(src_item->id()));
     CopyOverItem(src_item, dest_item.get());
-    dest->AddItemToFolder(dest_item.Pass(), src_item->folder_id());
+    dest->AddItemToFolder(std::move(dest_item), src_item->folder_id());
   }
 }
 
 scoped_ptr<AppListModel> FastShowPickler::UnpickleAppListModelForFastShow(
     base::Pickle* pickle) {
   base::PickleIterator it(*pickle);
   int read_version = 0;
   if (!it.ReadInt(&read_version))
     return scoped_ptr<AppListModel>();
   if (read_version != kVersion)
     return scoped_ptr<AppListModel>();
   int app_count = 0;
   if (!it.ReadInt(&app_count))
     return scoped_ptr<AppListModel>();
 
   scoped_ptr<AppListModel> model(new AppListModel);
   for (int i = 0; i < app_count; ++i) {
-    scoped_ptr<AppListItem> item(UnpickleAppListItem(&it).Pass());
+    scoped_ptr<AppListItem> item(UnpickleAppListItem(&it));
     if (!item)
       return scoped_ptr<AppListModel>();
     std::string folder_id = item->folder_id();
-    model->AddItemToFolder(item.Pass(), folder_id);
+    model->AddItemToFolder(std::move(item), folder_id);
   }
 
-  return model.Pass();
+  return model;
 }