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

chrome/browser/ui/search_engines/template_url_table_model.cc

 // Copyright (c) 2012 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/search_engines/template_url_table_model.h"
 
+#include <utility>
+
 #include "base/bind.h"
 #include "base/i18n/rtl.h"
 #include "base/macros.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/favicon/core/favicon_service.h"
 #include "components/favicon_base/favicon_types.h"
 #include "components/search_engines/template_url.h"
 #include "components/search_engines/template_url_service.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 244 matching lines @@
   DCHECK(!url.empty());
   template_url_service_->RemoveObserver(this);
   TemplateURLData data;
   data.SetShortName(short_name);
   data.SetKeyword(keyword);
   data.SetURL(url);
   TemplateURL* turl = new TemplateURL(data);
   template_url_service_->Add(turl);
   scoped_ptr<ModelEntry> entry(new ModelEntry(this, turl));
   template_url_service_->AddObserver(this);
-  AddEntry(index, entry.Pass());
+  AddEntry(index, std::move(entry));
 }
 
 void TemplateURLTableModel::ModifyTemplateURL(int index,
                                               const base::string16& title,
                                               const base::string16& keyword,
                                               const std::string& url) {
   DCHECK(index >= 0 && index <= RowCount());
   DCHECK(!url.empty());
   TemplateURL* template_url = GetTemplateURL(index);
   // The default search provider should support replacement.
@@ skipping 28 matching lines @@
   }
   return -1;
 }
 
 int TemplateURLTableModel::MoveToMainGroup(int index) {
   if (index < last_search_engine_index_)
     return index;  // Already in the main group.
 
   scoped_ptr<ModelEntry> current_entry(RemoveEntry(index));
   const int new_index = last_search_engine_index_++;
-  AddEntry(new_index, current_entry.Pass());
+  AddEntry(new_index, std::move(current_entry));
   return new_index;
 }
 
 int TemplateURLTableModel::MakeDefaultTemplateURL(int index) {
   if (index < 0 || index >= RowCount()) {
     NOTREACHED();
     return -1;
   }
 
   TemplateURL* keyword = GetTemplateURL(index);
@@ skipping 43 matching lines @@
 scoped_ptr<TemplateURLTableModel::ModelEntry>
 TemplateURLTableModel::RemoveEntry(int index) {
   scoped_ptr<ModelEntry> entry(entries_[index]);
   entries_.erase(index + entries_.begin());
   if (index < last_search_engine_index_)
     --last_search_engine_index_;
   if (index < last_other_engine_index_)
     --last_other_engine_index_;
   if (observer_)
     observer_->OnItemsRemoved(index, 1);
-  return entry.Pass();
+  return entry;
 }
 
 void TemplateURLTableModel::AddEntry(int index, scoped_ptr<ModelEntry> entry) {
   entries_.insert(entries_.begin() + index, entry.release());
   if (index <= last_other_engine_index_)
     ++last_other_engine_index_;
   if (observer_)
     observer_->OnItemsAdded(index, 1);
 }