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

ui/views/examples/examples_window.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 "ui/views/examples/examples_window.h"
 
 #include <algorithm>
 #include <string>
+#include <utility>
 
 #include "base/memory/scoped_vector.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/base/models/combobox_model.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/combobox/combobox.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/examples/bubble_example.h"
 #include "ui/views/examples/button_example.h"
@@ skipping 49 matching lines @@
   examples->push_back(new SingleSplitViewExample);
   examples->push_back(new SliderExample);
   examples->push_back(new TabbedPaneExample);
   examples->push_back(new TableExample);
   examples->push_back(new TextExample);
   examples->push_back(new TextfieldExample);
   examples->push_back(new ThrobberExample);
   examples->push_back(new TreeViewExample);
   examples->push_back(new VectorExample);
   examples->push_back(new WidgetExample);
-  return examples.Pass();
+  return examples;
 }
 
 struct ExampleTitleCompare {
   bool operator() (ExampleBase* a, ExampleBase* b) {
     return a->example_title() < b->example_title();
   }
 };
 
 ScopedExamples GetExamplesToShow(ScopedExamples extra) {
   ScopedExamples examples(CreateExamples());
   if (extra.get()) {
     examples->insert(examples->end(), extra->begin(), extra->end());
     extra->weak_clear();
   }
   std::sort(examples->begin(), examples->end(), ExampleTitleCompare());
-  return examples.Pass();
+  return examples;
 }
 
 }  // namespace
 
 // Model for the examples that are being added via AddExample().
 class ComboboxModelExampleList : public ui::ComboboxModel {
  public:
   ComboboxModelExampleList() {}
   ~ComboboxModelExampleList() override {}
 
@@ skipping 20 matching lines @@
 class ExamplesWindowContents : public WidgetDelegateView,
                                public ComboboxListener {
  public:
   ExamplesWindowContents(Operation operation, ScopedExamples examples)
       : combobox_(new Combobox(&combobox_model_)),
         example_shown_(new View),
         status_label_(new Label),
         operation_(operation) {
     instance_ = this;
     combobox_->set_listener(this);
-    combobox_model_.SetExamples(examples.Pass());
+    combobox_model_.SetExamples(std::move(examples));
     combobox_->ModelChanged();
 
     set_background(Background::CreateStandardPanelBackground());
     GridLayout* layout = new GridLayout(this);
     SetLayoutManager(layout);
     ColumnSet* column_set = layout->AddColumnSet(0);
     column_set->AddPaddingColumn(0, 5);
     column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
                           GridLayout::USE_PREF, 0, 0);
     column_set->AddPaddingColumn(0, 5);
@@ skipping 66 matching lines @@
 
 // static
 ExamplesWindowContents* ExamplesWindowContents::instance_ = NULL;
 
 void ShowExamplesWindow(Operation operation,
                         gfx::NativeWindow window_context,
                         ScopedExamples extra_examples) {
   if (ExamplesWindowContents::instance()) {
     ExamplesWindowContents::instance()->GetWidget()->Activate();
   } else {
-    ScopedExamples examples(GetExamplesToShow(extra_examples.Pass()));
+    ScopedExamples examples(GetExamplesToShow(std::move(extra_examples)));
     Widget* widget = new Widget;
     Widget::InitParams params;
-    params.delegate = new ExamplesWindowContents(operation, examples.Pass());
+    params.delegate =
+        new ExamplesWindowContents(operation, std::move(examples));
     params.context = window_context;
     widget->Init(params);
     widget->Show();
   }
 }
 
 void LogStatus(const std::string& string) {
   ExamplesWindowContents::instance()->SetStatus(string);
 }
 
 }  // namespace examples
 }  // namespace views