Convert Pass()→std::move() in //components/[n-z]*

components/web_view/frame_connection.cc

 // Copyright 2015 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 "components/web_view/frame_connection.h"
 
+#include <utility>
+
 #include "base/bind.h"
 #include "base/callback.h"
 #include "build/build_config.h"
 #include "components/clipboard/public/interfaces/clipboard.mojom.h"
 #include "components/mus/public/interfaces/gpu.mojom.h"
 #include "components/mus/public/interfaces/window_tree_host.mojom.h"
 #include "components/resource_provider/public/interfaces/resource_provider.mojom.h"
 #include "components/web_view/frame_tree.h"
 #include "components/web_view/frame_utils.h"
 #include "components/web_view/test_runner/public/interfaces/layout_test_runner.mojom.h"
@@ skipping 17 matching lines @@
     const uint32_t existing_content_handler_id,
     const FrameTreeDelegate::CanNavigateFrameCallback& callback,
     scoped_ptr<FrameConnection> connection) {
   mus::mojom::WindowTreeClientPtr window_tree_client;
   if (!AreAppIdsEqual(existing_content_handler_id,
                       connection->GetContentHandlerID())) {
     window_tree_client = connection->GetWindowTreeClient();
   }
   FrameConnection* connection_ptr = connection.get();
   callback.Run(connection_ptr->GetContentHandlerID(),
-               connection_ptr->frame_client(), connection.Pass(),
-               window_tree_client.Pass());
+               connection_ptr->frame_client(), std::move(connection),
+               std::move(window_tree_client));
 }
 
 }  // namespace
 
 FrameConnection::FrameConnection() : application_connection_(nullptr) {
 }
 
 FrameConnection::~FrameConnection() {
 }
 
 // static
 void FrameConnection::CreateConnectionForCanNavigateFrame(
     mojo::ApplicationImpl* app,
     Frame* frame,
     mojo::URLRequestPtr request,
     const FrameTreeDelegate::CanNavigateFrameCallback& callback) {
   scoped_ptr<FrameConnection> frame_connection(new FrameConnection);
   FrameConnection* connection = frame_connection.get();
-  connection->Init(app, request.Pass(),
+  connection->Init(app, std::move(request),
                    base::Bind(&OnGotContentHandlerForFrame, frame->app_id(),
                               callback, base::Passed(&frame_connection)));
 }
 
 void FrameConnection::Init(mojo::ApplicationImpl* app,
                            mojo::URLRequestPtr request,
                            const base::Closure& on_got_id_callback) {
   DCHECK(!application_connection_);
 
   mojo::CapabilityFilterPtr filter(mojo::CapabilityFilter::New());
   mojo::Array<mojo::String> resource_provider_interfaces;
   resource_provider_interfaces.push_back(
       resource_provider::ResourceProvider::Name_);
   filter->filter.insert("mojo:resource_provider",
-                        resource_provider_interfaces.Pass());
+                        std::move(resource_provider_interfaces));
 
   mojo::Array<mojo::String> network_service_interfaces;
   network_service_interfaces.push_back(mojo::CookieStore::Name_);
   network_service_interfaces.push_back(mojo::NetworkService::Name_);
   network_service_interfaces.push_back(mojo::URLLoaderFactory::Name_);
   network_service_interfaces.push_back(mojo::WebSocketFactory::Name_);
   filter->filter.insert("mojo:network_service",
-                        network_service_interfaces.Pass());
+                        std::move(network_service_interfaces));
 
   mojo::Array<mojo::String> clipboard_interfaces;
   clipboard_interfaces.push_back(mojo::Clipboard::Name_);
-  filter->filter.insert("mojo:clipboard", clipboard_interfaces.Pass());
+  filter->filter.insert("mojo:clipboard", std::move(clipboard_interfaces));
 
   mojo::Array<mojo::String> tracing_interfaces;
   tracing_interfaces.push_back(tracing::StartupPerformanceDataCollector::Name_);
   tracing_interfaces.push_back(tracing::TraceCollector::Name_);
-  filter->filter.insert("mojo:tracing", tracing_interfaces.Pass());
+  filter->filter.insert("mojo:tracing", std::move(tracing_interfaces));
 
   mojo::Array<mojo::String> window_manager_interfaces;
   window_manager_interfaces.push_back(mus::mojom::Gpu::Name_);
   window_manager_interfaces.push_back(mus::mojom::WindowTreeHostFactory::Name_);
-  filter->filter.insert("mojo:mus", window_manager_interfaces.Pass());
+  filter->filter.insert("mojo:mus", std::move(window_manager_interfaces));
 
   mojo::Array<mojo::String> test_runner_interfaces;
   test_runner_interfaces.push_back(LayoutTestRunner::Name_);
   filter->filter.insert("mojo:web_view_test_runner",
-                        test_runner_interfaces.Pass());
+                        std::move(test_runner_interfaces));
 
 #if defined(OS_LINUX) && !defined(OS_ANDROID)
   mojo::Array<mojo::String> font_service_interfaces;
   font_service_interfaces.push_back(font_service::FontService::Name_);
-  filter->filter.insert("mojo:font_service", font_service_interfaces.Pass());
+  filter->filter.insert("mojo:font_service",
+                        std::move(font_service_interfaces));
 #endif
 
-  mojo::ApplicationImpl::ConnectParams params(request.Pass());
-  params.set_filter(filter.Pass());
+  mojo::ApplicationImpl::ConnectParams params(std::move(request));
+  params.set_filter(std::move(filter));
   application_connection_ = app->ConnectToApplication(&params);
   application_connection_->ConnectToService(&frame_client_);
   application_connection_->AddContentHandlerIDCallback(on_got_id_callback);
 }
 
 mus::mojom::WindowTreeClientPtr FrameConnection::GetWindowTreeClient() {
   DCHECK(application_connection_);
   mus::mojom::WindowTreeClientPtr window_tree_client;
   application_connection_->ConnectToService(&window_tree_client);
-  return window_tree_client.Pass();
+  return window_tree_client;
 }
 
 uint32_t FrameConnection::GetContentHandlerID() const {
   uint32_t content_handler_id = mojo::Shell::kInvalidContentHandlerID;
   if (!application_connection_->GetContentHandlerID(&content_handler_id))
     NOTREACHED();
   return content_handler_id;
 }
 
 }  // namespace web_view