summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2015-12-25 23:59:32 -0800
committerCommit bot <commit-bot@chromium.org>2015-12-26 08:00:43 +0000
commit07945f63b71cb1f5362f5ebf984496d49dc08299 (patch)
tree51daf17b40c6b71bc923a2d456bf4d8a1edbcfd7
parentcab0f83c7f6c4401bc59c8b797461b6a2f7b08e1 (diff)
downloadchromium_src-07945f63b71cb1f5362f5ebf984496d49dc08299.zip
chromium_src-07945f63b71cb1f5362f5ebf984496d49dc08299.tar.gz
chromium_src-07945f63b71cb1f5362f5ebf984496d49dc08299.tar.bz2
Convert Pass()→std::move() in //content/renderer
BUG=557422 R=avi@chromium.org Review URL: https://codereview.chromium.org/1543423003 Cr-Commit-Position: refs/heads/master@{#366896}
-rw-r--r--content/renderer/background_sync/background_sync_client_impl.cc7
-rw-r--r--content/renderer/battery_status/battery_status_dispatcher_unittest.cc4
-rw-r--r--content/renderer/browser_plugin/browser_plugin.cc4
-rw-r--r--content/renderer/browser_render_view_browsertest.cc8
-rw-r--r--content/renderer/child_frame_compositing_helper.cc6
-rw-r--r--content/renderer/gpu/compositor_output_surface.cc6
-rw-r--r--content/renderer/gpu/frame_swap_message_queue.cc6
-rw-r--r--content/renderer/gpu/frame_swap_message_queue_unittest.cc21
-rw-r--r--content/renderer/gpu/gpu_benchmarking_extension.cc18
-rw-r--r--content/renderer/gpu/queue_message_swap_promise_unittest.cc8
-rw-r--r--content/renderer/gpu/render_widget_compositor.cc18
-rw-r--r--content/renderer/gpu/render_widget_compositor_unittest.cc4
-rw-r--r--content/renderer/history_controller.cc6
-rw-r--r--content/renderer/history_controller.h4
-rw-r--r--content/renderer/history_serialization.cc2
-rw-r--r--content/renderer/image_downloader/image_downloader_impl.cc8
-rw-r--r--content/renderer/input/input_event_filter.cc4
-rw-r--r--content/renderer/input/input_handler_manager.cc4
-rw-r--r--content/renderer/input/render_widget_input_handler.cc3
-rw-r--r--content/renderer/media/audio_track_recorder.cc3
-rw-r--r--content/renderer/media/audio_track_recorder_unittest.cc4
-rw-r--r--content/renderer/media/canvas_capture_handler.cc6
-rw-r--r--content/renderer/media/cdm/pepper_cdm_wrapper_impl.cc7
-rw-r--r--content/renderer/media/cdm/ppapi_decryptor.cc23
-rw-r--r--content/renderer/media/media_permission_dispatcher_impl.cc2
-rw-r--r--content/renderer/media/media_recorder_handler.cc6
-rw-r--r--content/renderer/media/media_recorder_handler_unittest.cc2
-rw-r--r--content/renderer/media/media_stream_audio_processor.cc3
-rw-r--r--content/renderer/media/media_stream_audio_processor_options.cc3
-rw-r--r--content/renderer/media/media_stream_video_capturer_source.cc4
-rw-r--r--content/renderer/media/media_stream_video_capturer_source_unittest.cc9
-rw-r--r--content/renderer/media/remote_media_stream_impl.cc6
-rw-r--r--content/renderer/media/renderer_gpu_video_accelerator_factories.cc2
-rw-r--r--content/renderer/media/rtc_data_channel_handler.cc3
-rw-r--r--content/renderer/media/rtc_peer_connection_handler.cc4
-rw-r--r--content/renderer/media/rtc_video_decoder.cc14
-rw-r--r--content/renderer/media/rtc_video_encoder.cc2
-rw-r--r--content/renderer/media/speech_recognition_audio_sink.cc3
-rw-r--r--content/renderer/media/speech_recognition_audio_sink_unittest.cc3
-rw-r--r--content/renderer/media/user_media_client_impl.cc2
-rw-r--r--content/renderer/media/user_media_client_impl_unittest.cc14
-rw-r--r--content/renderer/media/video_capture_impl.cc8
-rw-r--r--content/renderer/media/video_track_recorder.cc4
-rw-r--r--content/renderer/media/webmediaplayer_ms.cc4
-rw-r--r--content/renderer/media/webrtc/media_stream_remote_video_source.cc3
-rw-r--r--content/renderer/media/webrtc/media_stream_remote_video_source_unittest.cc14
-rw-r--r--content/renderer/media/webrtc_audio_renderer.cc4
-rw-r--r--content/renderer/media/webrtc_audio_renderer_unittest.cc6
-rw-r--r--content/renderer/media/webrtc_local_audio_renderer.cc4
-rw-r--r--content/renderer/mojo/service_registry_js_wrapper.cc4
-rw-r--r--content/renderer/p2p/filtering_network_manager.cc4
-rw-r--r--content/renderer/p2p/filtering_network_manager_unittest.cc3
-rw-r--r--content/renderer/p2p/port_allocator.cc3
-rw-r--r--content/renderer/pepper/content_decryptor_delegate.cc18
-rw-r--r--content/renderer/pepper/content_renderer_pepper_host_factory.cc4
-rw-r--r--content/renderer/pepper/pepper_audio_encoder_host.cc15
-rw-r--r--content/renderer/pepper/pepper_compositor_host.cc4
-rw-r--r--content/renderer/pepper/pepper_graphics_2d_host.cc5
-rw-r--r--content/renderer/pepper/pepper_media_stream_track_host_base.cc7
-rw-r--r--content/renderer/pepper/pepper_plugin_instance_impl.cc6
-rw-r--r--content/renderer/pepper/pepper_video_decoder_host.cc2
-rw-r--r--content/renderer/pepper/pepper_video_encoder_host.cc24
-rw-r--r--content/renderer/pepper/pepper_webplugin_impl.cc6
-rw-r--r--content/renderer/pepper/plugin_module.cc4
-rw-r--r--content/renderer/pepper/v8_var_converter_unittest.cc3
-rw-r--r--content/renderer/pepper/video_decoder_shim.cc3
-rw-r--r--content/renderer/presentation/presentation_dispatcher.cc19
-rw-r--r--content/renderer/raster_worker_pool.cc2
-rw-r--r--content/renderer/render_frame_impl.cc48
-rw-r--r--content/renderer/render_frame_proxy.cc5
-rw-r--r--content/renderer/render_thread_impl.cc42
-rw-r--r--content/renderer/render_thread_impl_browsertest.cc8
-rw-r--r--content/renderer/render_view_impl.cc2
-rw-r--r--content/renderer/render_widget.cc13
-rw-r--r--content/renderer/render_widget_browsertest.cc2
-rw-r--r--content/renderer/renderer_blink_platform_impl.cc4
-rw-r--r--content/renderer/renderer_main.cc7
-rw-r--r--content/renderer/service_worker/service_worker_context_client.cc15
-rw-r--r--content/renderer/service_worker/service_worker_type_util.cc2
-rw-r--r--content/renderer/shared_worker/embedded_shared_worker_stub.cc5
-rw-r--r--content/renderer/speech_recognition_dispatcher.cc3
-rw-r--r--content/renderer/usb/type_converters.cc6
-rw-r--r--content/renderer/usb/web_usb_client_impl.cc14
-rw-r--r--content/renderer/usb/web_usb_device_impl.cc22
84 files changed, 373 insertions, 274 deletions
diff --git a/content/renderer/background_sync/background_sync_client_impl.cc b/content/renderer/background_sync/background_sync_client_impl.cc
index 7d9c405..24630e3 100644
--- a/content/renderer/background_sync/background_sync_client_impl.cc
+++ b/content/renderer/background_sync/background_sync_client_impl.cc
@@ -4,6 +4,8 @@
#include "content/renderer/background_sync/background_sync_client_impl.h"
+#include <utility>
+
#include "content/child/background_sync/background_sync_provider.h"
#include "content/child/background_sync/background_sync_type_converters.h"
#include "content/renderer/service_worker/service_worker_context_client.h"
@@ -19,7 +21,8 @@ namespace content {
void BackgroundSyncClientImpl::Create(
int64_t service_worker_registration_id,
mojo::InterfaceRequest<BackgroundSyncServiceClient> request) {
- new BackgroundSyncClientImpl(service_worker_registration_id, request.Pass());
+ new BackgroundSyncClientImpl(service_worker_registration_id,
+ std::move(request));
}
BackgroundSyncClientImpl::~BackgroundSyncClientImpl() {}
@@ -28,7 +31,7 @@ BackgroundSyncClientImpl::BackgroundSyncClientImpl(
int64_t service_worker_registration_id,
mojo::InterfaceRequest<BackgroundSyncServiceClient> request)
: service_worker_registration_id_(service_worker_registration_id),
- binding_(this, request.Pass()),
+ binding_(this, std::move(request)),
callback_seq_num_(0) {}
void BackgroundSyncClientImpl::Sync(
diff --git a/content/renderer/battery_status/battery_status_dispatcher_unittest.cc b/content/renderer/battery_status/battery_status_dispatcher_unittest.cc
index 435e92a..5af3445 100644
--- a/content/renderer/battery_status/battery_status_dispatcher_unittest.cc
+++ b/content/renderer/battery_status/battery_status_dispatcher_unittest.cc
@@ -4,6 +4,8 @@
#include "content/renderer/battery_status/battery_status_dispatcher.h"
+#include <utility>
+
#include "base/macros.h"
#include "content/public/test/mock_render_thread.h"
#include "content/public/test/test_utils.h"
@@ -38,7 +40,7 @@ class BatteryStatusDispatcherTest : public testing::Test {
void UpdateBatteryStatus(const device::BatteryStatus& status) {
device::BatteryStatusPtr status_ptr(device::BatteryStatus::New());
*status_ptr = status;
- dispatcher_->DidChange(status_ptr.Pass());
+ dispatcher_->DidChange(std::move(status_ptr));
}
const MockBatteryStatusListener& listener() const {
diff --git a/content/renderer/browser_plugin/browser_plugin.cc b/content/renderer/browser_plugin/browser_plugin.cc
index 40110cd..b561127 100644
--- a/content/renderer/browser_plugin/browser_plugin.cc
+++ b/content/renderer/browser_plugin/browser_plugin.cc
@@ -5,6 +5,7 @@
#include "content/renderer/browser_plugin/browser_plugin.h"
#include <stddef.h>
+#include <utility>
#include "base/command_line.h"
#include "base/location.h"
@@ -217,8 +218,7 @@ void BrowserPlugin::OnCompositorFrameSwapped(const IPC::Message& message) {
EnableCompositing(true);
compositing_helper_->OnCompositorFrameSwapped(
- frame.Pass(),
- base::get<1>(param).producing_route_id,
+ std::move(frame), base::get<1>(param).producing_route_id,
base::get<1>(param).output_surface_id,
base::get<1>(param).producing_host_id,
base::get<1>(param).shared_memory_handle);
diff --git a/content/renderer/browser_render_view_browsertest.cc b/content/renderer/browser_render_view_browsertest.cc
index 19f5780..380f95f 100644
--- a/content/renderer/browser_render_view_browsertest.cc
+++ b/content/renderer/browser_render_view_browsertest.cc
@@ -6,6 +6,8 @@
// Note that these tests rely on single-process mode, and hence may be
// disabled in some configurations (check gyp files).
+#include <utility>
+
#include "base/bind.h"
#include "base/callback.h"
#include "base/command_line.h"
@@ -85,7 +87,7 @@ void InterceptNetworkTransactions(net::URLRequestContextGetter* getter,
new net::FailingHttpTransactionFactory(cache->GetSession(), error));
// Throw away old version; since this is a browser test, there is no
// need to restore the old state.
- cache->SetHttpNetworkTransactionFactoryForTesting(factory.Pass());
+ cache->SetHttpNetworkTransactionFactoryForTesting(std::move(factory));
}
void CallOnUIThreadValidatingReturn(const base::Closure& callback,
@@ -118,8 +120,8 @@ void ClearCache(net::URLRequestContextGetter* getter,
*backend = NULL;
disk_cache::Backend** backend_ptr = backend.get();
- net::CompletionCallback backend_callback(
- base::Bind(&BackendClearCache, base::Passed(backend.Pass()), callback));
+ net::CompletionCallback backend_callback(base::Bind(
+ &BackendClearCache, base::Passed(std::move(backend)), callback));
// backend_ptr is valid until all copies of backend_callback go out
// of scope.
diff --git a/content/renderer/child_frame_compositing_helper.cc b/content/renderer/child_frame_compositing_helper.cc
index e931773..408fc08 100644
--- a/content/renderer/child_frame_compositing_helper.cc
+++ b/content/renderer/child_frame_compositing_helper.cc
@@ -4,6 +4,8 @@
#include "content/renderer/child_frame_compositing_helper.h"
+#include <utility>
+
#include "cc/blink/web_layer_impl.h"
#include "cc/layers/delegated_frame_provider.h"
#include "cc/layers/delegated_frame_resource_collection.h"
@@ -226,7 +228,7 @@ void ChildFrameCompositingHelper::OnCompositorFrameSwapped(
}
if (!frame_provider_.get() || frame_provider_->frame_size() != frame_size) {
frame_provider_ = new cc::DelegatedFrameProvider(
- resource_collection_.get(), frame->delegated_frame_data.Pass());
+ resource_collection_.get(), std::move(frame->delegated_frame_data));
scoped_refptr<cc::DelegatedRendererLayer> delegated_layer =
cc::DelegatedRendererLayer::Create(
cc_blink::WebLayerImpl::LayerSettings(), frame_provider_.get());
@@ -235,7 +237,7 @@ void ChildFrameCompositingHelper::OnCompositorFrameSwapped(
blink::WebLayer* layer = new cc_blink::WebLayerImpl(delegated_layer);
UpdateWebLayer(layer);
} else {
- frame_provider_->SetFrameData(frame->delegated_frame_data.Pass());
+ frame_provider_->SetFrameData(std::move(frame->delegated_frame_data));
}
CheckSizeAndAdjustLayerProperties(
diff --git a/content/renderer/gpu/compositor_output_surface.cc b/content/renderer/gpu/compositor_output_surface.cc
index 3a6e699..8210e68 100644
--- a/content/renderer/gpu/compositor_output_surface.cc
+++ b/content/renderer/gpu/compositor_output_surface.cc
@@ -4,6 +4,8 @@
#include "content/renderer/gpu/compositor_output_surface.h"
+#include <utility>
+
#include "base/command_line.h"
#include "base/location.h"
#include "base/single_thread_task_runner.h"
@@ -36,7 +38,7 @@ CompositorOutputSurface::CompositorOutputSurface(
bool use_swap_compositor_frame_message)
: OutputSurface(context_provider,
worker_context_provider,
- software_device.Pass()),
+ std::move(software_device)),
output_surface_id_(output_surface_id),
use_swap_compositor_frame_message_(use_swap_compositor_frame_message),
output_surface_filter_(RenderThreadImpl::current()
@@ -102,7 +104,7 @@ void CompositorOutputSurface::ShortcutSwapAck(
OnSwapAck(output_surface_id, *layout_test_previous_frame_ack_);
- layout_test_previous_frame_ack_->gl_frame_data = gl_frame_data.Pass();
+ layout_test_previous_frame_ack_->gl_frame_data = std::move(gl_frame_data);
}
void CompositorOutputSurface::SwapBuffers(cc::CompositorFrame* frame) {
diff --git a/content/renderer/gpu/frame_swap_message_queue.cc b/content/renderer/gpu/frame_swap_message_queue.cc
index 33ae9fc..8f8fb6b 100644
--- a/content/renderer/gpu/frame_swap_message_queue.cc
+++ b/content/renderer/gpu/frame_swap_message_queue.cc
@@ -6,6 +6,7 @@
#include <algorithm>
#include <limits>
+#include <utility>
#include "base/containers/hash_tables.h"
#include "base/logging.h"
@@ -98,7 +99,7 @@ class SwapQueue : public FrameSwapMessageSubQueue {
bool* is_first) override {
if (is_first)
*is_first = Empty();
- queue_.push_back(msg.Pass());
+ queue_.push_back(std::move(msg));
}
void DrainMessages(int source_frame_number,
@@ -148,7 +149,8 @@ void FrameSwapMessageQueue::QueueMessageForFrame(MessageDeliveryPolicy policy,
scoped_ptr<IPC::Message> msg,
bool* is_first) {
base::AutoLock lock(lock_);
- GetSubQueue(policy)->QueueMessage(source_frame_number, msg.Pass(), is_first);
+ GetSubQueue(policy)
+ ->QueueMessage(source_frame_number, std::move(msg), is_first);
}
void FrameSwapMessageQueue::DidActivate(int source_frame_number) {
diff --git a/content/renderer/gpu/frame_swap_message_queue_unittest.cc b/content/renderer/gpu/frame_swap_message_queue_unittest.cc
index 0f6afa8..ef91720 100644
--- a/content/renderer/gpu/frame_swap_message_queue_unittest.cc
+++ b/content/renderer/gpu/frame_swap_message_queue_unittest.cc
@@ -3,6 +3,9 @@
// found in the LICENSE file.
#include "content/renderer/gpu/frame_swap_message_queue.h"
+
+#include <utility>
+
#include "ipc/ipc_message.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -18,30 +21,26 @@ class FrameSwapMessageQueueTest : public testing::Test {
protected:
void QueueNextSwapMessage(scoped_ptr<IPC::Message> msg) {
- queue_->QueueMessageForFrame(
- MESSAGE_DELIVERY_POLICY_WITH_NEXT_SWAP, 0, msg.Pass(), NULL);
+ queue_->QueueMessageForFrame(MESSAGE_DELIVERY_POLICY_WITH_NEXT_SWAP, 0,
+ std::move(msg), NULL);
}
void QueueNextSwapMessage(scoped_ptr<IPC::Message> msg, bool* first) {
- queue_->QueueMessageForFrame(
- MESSAGE_DELIVERY_POLICY_WITH_NEXT_SWAP, 0, msg.Pass(), first);
+ queue_->QueueMessageForFrame(MESSAGE_DELIVERY_POLICY_WITH_NEXT_SWAP, 0,
+ std::move(msg), first);
}
void QueueVisualStateMessage(int source_frame_number,
scoped_ptr<IPC::Message> msg) {
queue_->QueueMessageForFrame(MESSAGE_DELIVERY_POLICY_WITH_VISUAL_STATE,
- source_frame_number,
- msg.Pass(),
- NULL);
+ source_frame_number, std::move(msg), NULL);
}
void QueueVisualStateMessage(int source_frame_number,
scoped_ptr<IPC::Message> msg,
bool* first) {
queue_->QueueMessageForFrame(MESSAGE_DELIVERY_POLICY_WITH_VISUAL_STATE,
- source_frame_number,
- msg.Pass(),
- first);
+ source_frame_number, std::move(msg), first);
}
void DrainMessages(int source_frame_number,
@@ -64,7 +63,7 @@ class FrameSwapMessageQueueTest : public testing::Test {
}
scoped_ptr<IPC::Message> CloneMessage(const IPC::Message& other) {
- return make_scoped_ptr(new IPC::Message(other)).Pass();
+ return make_scoped_ptr(new IPC::Message(other));
}
void TestDidNotSwap(cc::SwapPromise::DidNotSwapReason reason);
diff --git a/content/renderer/gpu/gpu_benchmarking_extension.cc b/content/renderer/gpu/gpu_benchmarking_extension.cc
index dbed38e..e5b67ab 100644
--- a/content/renderer/gpu/gpu_benchmarking_extension.cc
+++ b/content/renderer/gpu/gpu_benchmarking_extension.cc
@@ -5,8 +5,8 @@
#include "content/renderer/gpu/gpu_benchmarking_extension.h"
#include <stddef.h>
-
#include <string>
+#include <utility>
#include "base/base64.h"
#include "base/files/file_path.h"
@@ -361,7 +361,7 @@ bool BeginSmoothScroll(v8::Isolate* isolate,
// progress, we will leak the callback and context. This needs to be fixed,
// somehow.
context.render_view_impl()->QueueSyntheticGesture(
- gesture_params.Pass(),
+ std::move(gesture_params),
base::Bind(&OnSyntheticGestureCompleted, callback_and_context));
return true;
@@ -403,7 +403,7 @@ bool BeginSmoothDrag(v8::Isolate* isolate,
// progress, we will leak the callback and context. This needs to be fixed,
// somehow.
context.render_view_impl()->QueueSyntheticGesture(
- gesture_params.Pass(),
+ std::move(gesture_params),
base::Bind(&OnSyntheticGestureCompleted, callback_and_context));
return true;
@@ -696,7 +696,7 @@ bool GpuBenchmarking::ScrollBounce(gin::Arguments* args) {
// progress, we will leak the callback and context. This needs to be fixed,
// somehow.
context.render_view_impl()->QueueSyntheticGesture(
- gesture_params.Pass(),
+ std::move(gesture_params),
base::Bind(&OnSyntheticGestureCompleted, callback_and_context));
return true;
@@ -744,7 +744,7 @@ bool GpuBenchmarking::PinchBy(gin::Arguments* args) {
// progress, we will leak the callback and context. This needs to be fixed,
// somehow.
context.render_view_impl()->QueueSyntheticGesture(
- gesture_params.Pass(),
+ std::move(gesture_params),
base::Bind(&OnSyntheticGestureCompleted, callback_and_context));
return true;
@@ -810,7 +810,7 @@ bool GpuBenchmarking::Tap(gin::Arguments* args) {
// progress, we will leak the callback and context. This needs to be fixed,
// somehow.
context.render_view_impl()->QueueSyntheticGesture(
- gesture_params.Pass(),
+ std::move(gesture_params),
base::Bind(&OnSyntheticGestureCompleted, callback_and_context));
return true;
@@ -846,8 +846,7 @@ int GpuBenchmarking::RunMicroBenchmark(gin::Arguments* args) {
make_scoped_ptr(converter->FromV8Value(arguments, v8_context));
return context.compositor()->ScheduleMicroBenchmark(
- name,
- value.Pass(),
+ name, std::move(value),
base::Bind(&OnMicroBenchmarkCompleted, callback_and_context));
}
@@ -865,7 +864,8 @@ bool GpuBenchmarking::SendMessageToMicroBenchmark(
scoped_ptr<base::Value> value =
make_scoped_ptr(converter->FromV8Value(message, v8_context));
- return context.compositor()->SendMessageToMicroBenchmark(id, value.Pass());
+ return context.compositor()->SendMessageToMicroBenchmark(id,
+ std::move(value));
}
bool GpuBenchmarking::HasGpuProcess() {
diff --git a/content/renderer/gpu/queue_message_swap_promise_unittest.cc b/content/renderer/gpu/queue_message_swap_promise_unittest.cc
index 234ff77..38ea08f 100644
--- a/content/renderer/gpu/queue_message_swap_promise_unittest.cc
+++ b/content/renderer/gpu/queue_message_swap_promise_unittest.cc
@@ -67,11 +67,9 @@ class QueueMessageSwapPromiseTest : public testing::Test {
scoped_ptr<cc::SwapPromise> QueueMessageImpl(IPC::Message* msg,
MessageDeliveryPolicy policy,
int source_frame_number) {
- return TestRenderWidget::QueueMessageImpl(msg,
- policy,
- frame_swap_message_queue_.get(),
- sync_message_filter_,
- source_frame_number).Pass();
+ return TestRenderWidget::QueueMessageImpl(
+ msg, policy, frame_swap_message_queue_.get(), sync_message_filter_,
+ source_frame_number);
}
const std::vector<scoped_ptr<IPC::Message>>& DirectSendMessages() {
diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc
index aae1834..a23fcbf 100644
--- a/content/renderer/gpu/render_widget_compositor.cc
+++ b/content/renderer/gpu/render_widget_compositor.cc
@@ -5,9 +5,9 @@
#include "content/renderer/gpu/render_widget_compositor.h"
#include <stddef.h>
-
#include <limits>
#include <string>
+#include <utility>
#include "base/command_line.h"
#include "base/location.h"
@@ -495,7 +495,7 @@ void RenderWidgetCompositor::Initialize() {
params.settings = &settings;
params.task_graph_runner = task_graph_runner;
params.main_task_runner = main_thread_compositor_task_runner;
- params.external_begin_frame_source = external_begin_frame_source.Pass();
+ params.external_begin_frame_source = std::move(external_begin_frame_source);
if (compositor_thread_task_runner.get()) {
layer_tree_host_ = cc::LayerTreeHost::CreateThreaded(
compositor_thread_task_runner, &params);
@@ -550,7 +550,7 @@ RenderWidgetCompositor::CreateLatencyInfoSwapPromiseMonitor(
void RenderWidgetCompositor::QueueSwapPromise(
scoped_ptr<cc::SwapPromise> swap_promise) {
- layer_tree_host_->QueueSwapPromise(swap_promise.Pass());
+ layer_tree_host_->QueueSwapPromise(std::move(swap_promise));
}
int RenderWidgetCompositor::GetSourceFrameNumber() const {
@@ -577,13 +577,14 @@ int RenderWidgetCompositor::ScheduleMicroBenchmark(
const std::string& name,
scoped_ptr<base::Value> value,
const base::Callback<void(scoped_ptr<base::Value>)>& callback) {
- return layer_tree_host_->ScheduleMicroBenchmark(name, value.Pass(), callback);
+ return layer_tree_host_->ScheduleMicroBenchmark(name, std::move(value),
+ callback);
}
bool RenderWidgetCompositor::SendMessageToMicroBenchmark(
int id,
scoped_ptr<base::Value> value) {
- return layer_tree_host_->SendMessageToMicroBenchmark(id, value.Pass());
+ return layer_tree_host_->SendMessageToMicroBenchmark(id, std::move(value));
}
void RenderWidgetCompositor::setRootLayer(const blink::WebLayer& layer) {
@@ -876,7 +877,8 @@ void RenderWidgetCompositor::UpdateLayerTreeHost() {
// For WebViewImpl, this will always have a root layer. For other widgets,
// the widget may be closed before servicing this request, so ignore it.
if (cc::Layer* root_layer = layer_tree_host_->root_layer()) {
- root_layer->RequestCopyOfOutput(temporary_copy_output_request_.Pass());
+ root_layer->RequestCopyOfOutput(
+ std::move(temporary_copy_output_request_));
} else {
temporary_copy_output_request_->SendEmptyResult();
temporary_copy_output_request_ = nullptr;
@@ -916,7 +918,7 @@ void RenderWidgetCompositor::RequestNewOutputSurface() {
DCHECK_EQ(surface->capabilities().max_frames_pending, 1);
- layer_tree_host_->SetOutputSurface(surface.Pass());
+ layer_tree_host_->SetOutputSurface(std::move(surface));
}
void RenderWidgetCompositor::DidInitializeOutputSurface() {
@@ -1034,7 +1036,7 @@ void RenderWidgetCompositor::OnHandleCompositorProto(
return;
}
- remote_proto_channel_receiver_->OnProtoReceived(deserialized.Pass());
+ remote_proto_channel_receiver_->OnProtoReceived(std::move(deserialized));
}
cc::ManagedMemoryPolicy RenderWidgetCompositor::GetGpuMemoryPolicy(
diff --git a/content/renderer/gpu/render_widget_compositor_unittest.cc b/content/renderer/gpu/render_widget_compositor_unittest.cc
index f202310..2f9c7f6 100644
--- a/content/renderer/gpu/render_widget_compositor_unittest.cc
+++ b/content/renderer/gpu/render_widget_compositor_unittest.cc
@@ -4,6 +4,8 @@
#include "content/renderer/gpu/render_widget_compositor.h"
+#include <utility>
+
#include "base/location.h"
#include "base/macros.h"
#include "base/single_thread_task_runner.h"
@@ -142,7 +144,7 @@ class RenderWidgetCompositorOutputSurface : public RenderWidgetCompositor {
// Image support required for synchronous compositing.
context->set_support_image(true);
// Create delegating surface so that max_pending_frames = 1.
- return cc::FakeOutputSurface::CreateDelegating3d(context.Pass());
+ return cc::FakeOutputSurface::CreateDelegating3d(std::move(context));
}
return use_null_output_surface_
? nullptr
diff --git a/content/renderer/history_controller.cc b/content/renderer/history_controller.cc
index 2507403..80b20dd 100644
--- a/content/renderer/history_controller.cc
+++ b/content/renderer/history_controller.cc
@@ -35,6 +35,8 @@
#include "content/renderer/history_controller.h"
+#include <utility>
+
#include "content/common/navigation_params.h"
#include "content/common/site_isolation_policy.h"
#include "content/renderer/render_frame_impl.h"
@@ -67,8 +69,8 @@ void HistoryController::GoToEntry(
HistoryFrameLoadVector same_document_loads;
HistoryFrameLoadVector different_document_loads;
- set_provisional_entry(target_entry.Pass());
- navigation_params_ = navigation_params.Pass();
+ set_provisional_entry(std::move(target_entry));
+ navigation_params_ = std::move(navigation_params);
if (current_entry_) {
RecursiveGoToEntry(
diff --git a/content/renderer/history_controller.h b/content/renderer/history_controller.h
index aeeae01..c8b00f2 100644
--- a/content/renderer/history_controller.h
+++ b/content/renderer/history_controller.h
@@ -35,6 +35,8 @@
#ifndef CONTENT_RENDERER_HISTORY_CONTROLLER_H_
#define CONTENT_RENDERER_HISTORY_CONTROLLER_H_
+#include <utility>
+
#include "base/containers/hash_tables.h"
#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
@@ -112,7 +114,7 @@ class CONTENT_EXPORT HistoryController {
~HistoryController();
void set_provisional_entry(scoped_ptr<HistoryEntry> entry) {
- provisional_entry_ = entry.Pass();
+ provisional_entry_ = std::move(entry);
}
void GoToEntry(blink::WebLocalFrame* main_frame,
diff --git a/content/renderer/history_serialization.cc b/content/renderer/history_serialization.cc
index a8e3692..f227ed3 100644
--- a/content/renderer/history_serialization.cc
+++ b/content/renderer/history_serialization.cc
@@ -206,7 +206,7 @@ scoped_ptr<HistoryEntry> PageStateToHistoryEntry(const PageState& page_state) {
scoped_ptr<HistoryEntry> entry(new HistoryEntry());
RecursivelyGenerateHistoryItem(state.top, entry->root_history_node());
- return entry.Pass();
+ return entry;
}
} // namespace content
diff --git a/content/renderer/image_downloader/image_downloader_impl.cc b/content/renderer/image_downloader/image_downloader_impl.cc
index c969418..c05998b 100644
--- a/content/renderer/image_downloader/image_downloader_impl.cc
+++ b/content/renderer/image_downloader/image_downloader_impl.cc
@@ -4,6 +4,8 @@
#include "content/renderer/image_downloader/image_downloader_impl.h"
+#include <utility>
+
#include "base/bind.h"
#include "base/logging.h"
#include "base/message_loop/message_loop.h"
@@ -116,7 +118,7 @@ namespace content {
ImageDownloaderImpl::ImageDownloaderImpl(
RenderFrame* render_frame,
mojo::InterfaceRequest<image_downloader::ImageDownloader> request)
- : RenderFrameObserver(render_frame), binding_(this, request.Pass()) {
+ : RenderFrameObserver(render_frame), binding_(this, std::move(request)) {
DCHECK(render_frame);
}
@@ -130,7 +132,7 @@ void ImageDownloaderImpl::CreateMojoService(
DVLOG(1) << "ImageDownloaderImpl::CreateService";
DCHECK(render_frame);
- new ImageDownloaderImpl(render_frame, request.Pass());
+ new ImageDownloaderImpl(render_frame, std::move(request));
}
// ImageDownloader methods:
@@ -218,7 +220,7 @@ void ImageDownloaderImpl::ReplyDownloadResult(
result->original_image_sizes =
mojo::Array<mojo::SizePtr>::From(result_original_image_sizes);
- callback.Run(result.Pass());
+ callback.Run(std::move(result));
}
} // namespace content
diff --git a/content/renderer/input/input_event_filter.cc b/content/renderer/input/input_event_filter.cc
index 0647685..c855862 100644
--- a/content/renderer/input/input_event_filter.cc
+++ b/content/renderer/input/input_event_filter.cc
@@ -4,6 +4,8 @@
#include "content/renderer/input/input_event_filter.h"
+#include <utility>
+
#include "base/auto_reset.h"
#include "base/bind.h"
#include "base/location.h"
@@ -178,7 +180,7 @@ void InputEventFilter::ForwardToHandler(const IPC::Message& message) {
return;
InputEventAck ack(event->type, ack_state, latency_info,
- overscroll_params.Pass(),
+ std::move(overscroll_params),
WebInputEventTraits::GetUniqueTouchEventId(*event));
SendMessage(scoped_ptr<IPC::Message>(
new InputHostMsg_HandleInputEvent_ACK(routing_id, ack)));
diff --git a/content/renderer/input/input_handler_manager.cc b/content/renderer/input/input_handler_manager.cc
index 85f229d..6ffc432 100644
--- a/content/renderer/input/input_handler_manager.cc
+++ b/content/renderer/input/input_handler_manager.cc
@@ -4,6 +4,8 @@
#include "content/renderer/input/input_handler_manager.h"
+#include <utility>
+
#include "base/bind.h"
#include "base/location.h"
#include "base/single_thread_task_runner.h"
@@ -96,7 +98,7 @@ void InputHandlerManager::AddInputHandlerOnCompositorThread(
scoped_ptr<InputHandlerWrapper> wrapper(new InputHandlerWrapper(
this, routing_id, main_task_runner, input_handler, render_view_impl));
client_->DidAddInputHandler(routing_id, wrapper->input_handler_proxy());
- input_handlers_.add(routing_id, wrapper.Pass());
+ input_handlers_.add(routing_id, std::move(wrapper));
}
void InputHandlerManager::RemoveInputHandler(int routing_id) {
diff --git a/content/renderer/input/render_widget_input_handler.cc b/content/renderer/input/render_widget_input_handler.cc
index 78c6465..5e358f6 100644
--- a/content/renderer/input/render_widget_input_handler.cc
+++ b/content/renderer/input/render_widget_input_handler.cc
@@ -6,6 +6,7 @@
#include <stddef.h>
#include <stdint.h>
+#include <utility>
#include "base/auto_reset.h"
#include "base/metrics/histogram_macros.h"
@@ -366,7 +367,7 @@ void RenderWidgetInputHandler::HandleInputEvent(
if (WebInputEventTraits::WillReceiveAckFromRenderer(input_event) && !no_ack) {
scoped_ptr<InputEventAck> response(new InputEventAck(
input_event.type, ack_result, swap_latency_info,
- event_overscroll.Pass(),
+ std::move(event_overscroll),
WebInputEventTraits::GetUniqueTouchEventId(input_event)));
if (rate_limiting_wanted && frame_pending && !widget_->is_hidden()) {
// We want to rate limit the input events in this case, so we'll wait for
diff --git a/content/renderer/media/audio_track_recorder.cc b/content/renderer/media/audio_track_recorder.cc
index 99e3b5b..71f35cb 100644
--- a/content/renderer/media/audio_track_recorder.cc
+++ b/content/renderer/media/audio_track_recorder.cc
@@ -5,6 +5,7 @@
#include "content/renderer/media/audio_track_recorder.h"
#include <stdint.h>
+#include <utility>
#include "base/bind.h"
#include "base/macros.h"
@@ -186,7 +187,7 @@ void AudioTrackRecorder::AudioEncoder::EncodeAudio(
scoped_ptr<std::string> encoded_data(new std::string());
if (EncodeFromFilledBuffer(encoded_data.get())) {
- on_encoded_audio_cb_.Run(audio_params_, encoded_data.Pass(),
+ on_encoded_audio_cb_.Run(audio_params_, std::move(encoded_data),
buffer_capture_time);
}
diff --git a/content/renderer/media/audio_track_recorder_unittest.cc b/content/renderer/media/audio_track_recorder_unittest.cc
index c28e008..eac4956 100644
--- a/content/renderer/media/audio_track_recorder_unittest.cc
+++ b/content/renderer/media/audio_track_recorder_unittest.cc
@@ -132,7 +132,7 @@ class AudioTrackRecorderTest : public TestWithParam<ATRTestParams> {
first_params_.sample_rate()) /
1000));
first_source_.OnMoreData(bus.get(), 0, 0);
- return bus.Pass();
+ return bus;
}
scoped_ptr<media::AudioBus> GetSecondSourceAudioBus() {
scoped_ptr<media::AudioBus> bus(media::AudioBus::Create(
@@ -142,7 +142,7 @@ class AudioTrackRecorderTest : public TestWithParam<ATRTestParams> {
second_params_.sample_rate()) /
1000));
second_source_.OnMoreData(bus.get(), 0, 0);
- return bus.Pass();
+ return bus;
}
MOCK_METHOD3(DoOnEncodedAudio,
diff --git a/content/renderer/media/canvas_capture_handler.cc b/content/renderer/media/canvas_capture_handler.cc
index 0f48508..1ba2879 100644
--- a/content/renderer/media/canvas_capture_handler.cc
+++ b/content/renderer/media/canvas_capture_handler.cc
@@ -4,6 +4,8 @@
#include "content/renderer/media/canvas_capture_handler.h"
+#include <utility>
+
#include "base/base64.h"
#include "base/bind_helpers.h"
#include "base/macros.h"
@@ -102,7 +104,7 @@ CanvasCaptureHandler::CanvasCaptureHandler(const blink::WebSize& size,
scoped_ptr<media::VideoCapturerSource> video_source(
new CanvasCaptureHandler::VideoCapturerSource(
weak_ptr_factory_.GetWeakPtr(), frame_rate));
- AddVideoCapturerSourceToVideoTrack(video_source.Pass(), track);
+ AddVideoCapturerSourceToVideoTrack(std::move(video_source), track);
}
CanvasCaptureHandler::~CanvasCaptureHandler() {
@@ -192,7 +194,7 @@ void CanvasCaptureHandler::AddVideoCapturerSourceToVideoTrack(
blink::WebMediaStreamSource webkit_source;
scoped_ptr<MediaStreamVideoSource> media_stream_source(
new MediaStreamVideoCapturerSource(
- MediaStreamSource::SourceStoppedCallback(), source.Pass()));
+ MediaStreamSource::SourceStoppedCallback(), std::move(source)));
webkit_source.initialize(track_id, blink::WebMediaStreamSource::TypeVideo,
track_id, false, true);
webkit_source.setExtraData(media_stream_source.get());
diff --git a/content/renderer/media/cdm/pepper_cdm_wrapper_impl.cc b/content/renderer/media/cdm/pepper_cdm_wrapper_impl.cc
index 742f4fa..1dfc24d 100644
--- a/content/renderer/media/cdm/pepper_cdm_wrapper_impl.cc
+++ b/content/renderer/media/cdm/pepper_cdm_wrapper_impl.cc
@@ -5,6 +5,8 @@
#if defined(ENABLE_PEPPER_CDMS)
#include "content/renderer/media/cdm/pepper_cdm_wrapper_impl.h"
+#include <utility>
+
#include "content/renderer/pepper/pepper_plugin_instance_impl.h"
#include "content/renderer/pepper/pepper_webplugin_impl.h"
#include "third_party/WebKit/public/platform/WebString.h"
@@ -50,13 +52,14 @@ scoped_ptr<PepperCdmWrapper> PepperCdmWrapperImpl::Create(
return scoped_ptr<PepperCdmWrapper>();
return scoped_ptr<PepperCdmWrapper>(
- new PepperCdmWrapperImpl(helper_plugin.Pass(), plugin_instance));
+ new PepperCdmWrapperImpl(std::move(helper_plugin), plugin_instance));
}
PepperCdmWrapperImpl::PepperCdmWrapperImpl(
ScopedHelperPlugin helper_plugin,
const scoped_refptr<PepperPluginInstanceImpl>& plugin_instance)
- : helper_plugin_(helper_plugin.Pass()), plugin_instance_(plugin_instance) {
+ : helper_plugin_(std::move(helper_plugin)),
+ plugin_instance_(plugin_instance) {
DCHECK(helper_plugin_);
DCHECK(plugin_instance_.get());
// Plugin must be a CDM.
diff --git a/content/renderer/media/cdm/ppapi_decryptor.cc b/content/renderer/media/cdm/ppapi_decryptor.cc
index 023c361..b505f3c 100644
--- a/content/renderer/media/cdm/ppapi_decryptor.cc
+++ b/content/renderer/media/cdm/ppapi_decryptor.cc
@@ -5,6 +5,7 @@
#include "content/renderer/media/cdm/ppapi_decryptor.h"
#include <string>
+#include <utility>
#include "base/bind.h"
#include "base/location.h"
@@ -56,7 +57,7 @@ void PpapiDecryptor::Create(
}
scoped_refptr<PpapiDecryptor> ppapi_decryptor(
- new PpapiDecryptor(pepper_cdm_wrapper.Pass(), session_message_cb,
+ new PpapiDecryptor(std::move(pepper_cdm_wrapper), session_message_cb,
session_closed_cb, legacy_session_error_cb,
session_keys_change_cb, session_expiration_update_cb));
@@ -65,7 +66,7 @@ void PpapiDecryptor::Create(
new media::CdmInitializedPromise(cdm_created_cb, ppapi_decryptor));
ppapi_decryptor->InitializeCdm(key_system, allow_distinctive_identifier,
- allow_persistent_state, promise.Pass());
+ allow_persistent_state, std::move(promise));
}
PpapiDecryptor::PpapiDecryptor(
@@ -75,7 +76,7 @@ PpapiDecryptor::PpapiDecryptor(
const media::LegacySessionErrorCB& legacy_session_error_cb,
const media::SessionKeysChangeCB& session_keys_change_cb,
const media::SessionExpirationUpdateCB& session_expiration_update_cb)
- : pepper_cdm_wrapper_(pepper_cdm_wrapper.Pass()),
+ : pepper_cdm_wrapper_(std::move(pepper_cdm_wrapper)),
session_message_cb_(session_message_cb),
session_closed_cb_(session_closed_cb),
legacy_session_error_cb_(legacy_session_error_cb),
@@ -109,7 +110,7 @@ void PpapiDecryptor::InitializeCdm(
base::Bind(&PpapiDecryptor::OnSessionKeysChange, weak_this),
base::Bind(&PpapiDecryptor::OnSessionExpirationUpdate, weak_this),
base::Bind(&PpapiDecryptor::OnFatalPluginError, weak_this),
- promise.Pass());
+ std::move(promise));
}
void PpapiDecryptor::SetServerCertificate(
@@ -123,7 +124,7 @@ void PpapiDecryptor::SetServerCertificate(
return;
}
- CdmDelegate()->SetServerCertificate(certificate, promise.Pass());
+ CdmDelegate()->SetServerCertificate(certificate, std::move(promise));
}
void PpapiDecryptor::CreateSessionAndGenerateRequest(
@@ -140,7 +141,7 @@ void PpapiDecryptor::CreateSessionAndGenerateRequest(
}
CdmDelegate()->CreateSessionAndGenerateRequest(session_type, init_data_type,
- init_data, promise.Pass());
+ init_data, std::move(promise));
}
void PpapiDecryptor::LoadSession(
@@ -154,7 +155,7 @@ void PpapiDecryptor::LoadSession(
promise->reject(INVALID_STATE_ERROR, 0, "CDM has failed.");
return;
}
- CdmDelegate()->LoadSession(session_type, session_id, promise.Pass());
+ CdmDelegate()->LoadSession(session_type, session_id, std::move(promise));
}
void PpapiDecryptor::UpdateSession(
@@ -168,7 +169,7 @@ void PpapiDecryptor::UpdateSession(
promise->reject(INVALID_STATE_ERROR, 0, "CDM has failed.");
return;
}
- CdmDelegate()->UpdateSession(session_id, response, promise.Pass());
+ CdmDelegate()->UpdateSession(session_id, response, std::move(promise));
}
void PpapiDecryptor::CloseSession(const std::string& session_id,
@@ -181,7 +182,7 @@ void PpapiDecryptor::CloseSession(const std::string& session_id,
return;
}
- CdmDelegate()->CloseSession(session_id, promise.Pass());
+ CdmDelegate()->CloseSession(session_id, std::move(promise));
}
void PpapiDecryptor::RemoveSession(
@@ -195,7 +196,7 @@ void PpapiDecryptor::RemoveSession(
return;
}
- CdmDelegate()->RemoveSession(session_id, promise.Pass());
+ CdmDelegate()->RemoveSession(session_id, std::move(promise));
}
media::CdmContext* PpapiDecryptor::GetCdmContext() {
@@ -413,7 +414,7 @@ void PpapiDecryptor::OnSessionKeysChange(const std::string& session_id,
AttemptToResumePlayback();
session_keys_change_cb_.Run(session_id, has_additional_usable_key,
- keys_info.Pass());
+ std::move(keys_info));
}
void PpapiDecryptor::OnSessionExpirationUpdate(
diff --git a/content/renderer/media/media_permission_dispatcher_impl.cc b/content/renderer/media/media_permission_dispatcher_impl.cc
index d8440c2..a1daf8c 100644
--- a/content/renderer/media/media_permission_dispatcher_impl.cc
+++ b/content/renderer/media/media_permission_dispatcher_impl.cc
@@ -86,7 +86,7 @@ scoped_ptr<media::MediaPermission> MediaPermissionDispatcherImpl::CreateProxy(
scoped_ptr<media::MediaPermission> media_permission_proxy(
new MediaPermissionDispatcherProxy(task_runner_, caller_task_runner,
weak_ptr_factory_.GetWeakPtr()));
- return media_permission_proxy.Pass();
+ return media_permission_proxy;
}
void MediaPermissionDispatcherImpl::OnPermissionStatus(
diff --git a/content/renderer/media/media_recorder_handler.cc b/content/renderer/media/media_recorder_handler.cc
index 7fc40dc..2944013 100644
--- a/content/renderer/media/media_recorder_handler.cc
+++ b/content/renderer/media/media_recorder_handler.cc
@@ -4,6 +4,8 @@
#include "content/renderer/media/media_recorder_handler.h"
+#include <utility>
+
#include "base/bind.h"
#include "base/location.h"
#include "base/logging.h"
@@ -211,7 +213,7 @@ void MediaRecorderHandler::OnEncodedVideo(
DCHECK(main_render_thread_checker_.CalledOnValidThread());
if (!webm_muxer_)
return;
- webm_muxer_->OnEncodedVideo(video_frame, encoded_data.Pass(), timestamp,
+ webm_muxer_->OnEncodedVideo(video_frame, std::move(encoded_data), timestamp,
is_key_frame);
}
@@ -220,7 +222,7 @@ void MediaRecorderHandler::OnEncodedAudio(const media::AudioParameters& params,
base::TimeTicks timestamp) {
DCHECK(main_render_thread_checker_.CalledOnValidThread());
if (webm_muxer_)
- webm_muxer_->OnEncodedAudio(params, encoded_data.Pass(), timestamp);
+ webm_muxer_->OnEncodedAudio(params, std::move(encoded_data), timestamp);
}
void MediaRecorderHandler::WriteData(base::StringPiece data) {
diff --git a/content/renderer/media/media_recorder_handler_unittest.cc b/content/renderer/media/media_recorder_handler_unittest.cc
index e1aaeab..fe566b8 100644
--- a/content/renderer/media/media_recorder_handler_unittest.cc
+++ b/content/renderer/media/media_recorder_handler_unittest.cc
@@ -117,7 +117,7 @@ class MediaRecorderHandlerTest : public TestWithParam<MediaRecorderTestParams>,
kTestAudioChannels,
kTestAudioSampleRate * kTestAudioBufferDurationMS / 1000));
audio_source_.OnMoreData(bus.get(), 0, 0);
- return bus.Pass();
+ return bus;
}
// A ChildProcess and a MessageLoopForUI are both needed to fool the Tracks
diff --git a/content/renderer/media/media_stream_audio_processor.cc b/content/renderer/media/media_stream_audio_processor.cc
index 40889700..1deb1e4 100644
--- a/content/renderer/media/media_stream_audio_processor.cc
+++ b/content/renderer/media/media_stream_audio_processor.cc
@@ -6,6 +6,7 @@
#include <stddef.h>
#include <stdint.h>
+#include <utility>
#include "base/command_line.h"
#include "base/metrics/field_trial.h"
@@ -418,7 +419,7 @@ void MediaStreamAudioProcessor::OnAecDumpFile(
DCHECK(file.IsValid());
if (audio_processing_)
- StartEchoCancellationDump(audio_processing_.get(), file.Pass());
+ StartEchoCancellationDump(audio_processing_.get(), std::move(file));
else
file.Close();
}
diff --git a/content/renderer/media/media_stream_audio_processor_options.cc b/content/renderer/media/media_stream_audio_processor_options.cc
index 379f4ca..52ed1d7 100644
--- a/content/renderer/media/media_stream_audio_processor_options.cc
+++ b/content/renderer/media/media_stream_audio_processor_options.cc
@@ -5,6 +5,7 @@
#include "content/renderer/media/media_stream_audio_processor_options.h"
#include <stddef.h>
+#include <utility>
#include "base/files/file_path.h"
#include "base/files/file_util.h"
@@ -329,7 +330,7 @@ void StartEchoCancellationDump(AudioProcessing* audio_processing,
base::File aec_dump_file) {
DCHECK(aec_dump_file.IsValid());
- FILE* stream = base::FileToFILE(aec_dump_file.Pass(), "w");
+ FILE* stream = base::FileToFILE(std::move(aec_dump_file), "w");
if (!stream) {
LOG(ERROR) << "Failed to open AEC dump file";
return;
diff --git a/content/renderer/media/media_stream_video_capturer_source.cc b/content/renderer/media/media_stream_video_capturer_source.cc
index ca80b63..59be548 100644
--- a/content/renderer/media/media_stream_video_capturer_source.cc
+++ b/content/renderer/media/media_stream_video_capturer_source.cc
@@ -4,6 +4,8 @@
#include "content/renderer/media/media_stream_video_capturer_source.h"
+#include <utility>
+
#include "base/bind.h"
#include "base/callback_helpers.h"
#include "base/location.h"
@@ -385,7 +387,7 @@ void LocalVideoCapturerSource::OnDeviceSupportedFormatsEnumerated(
MediaStreamVideoCapturerSource::MediaStreamVideoCapturerSource(
const SourceStoppedCallback& stop_callback,
scoped_ptr<media::VideoCapturerSource> source)
- : source_(source.Pass()) {
+ : source_(std::move(source)) {
SetStopCallback(stop_callback);
}
diff --git a/content/renderer/media/media_stream_video_capturer_source_unittest.cc b/content/renderer/media/media_stream_video_capturer_source_unittest.cc
index c018776..79a2298 100644
--- a/content/renderer/media/media_stream_video_capturer_source_unittest.cc
+++ b/content/renderer/media/media_stream_video_capturer_source_unittest.cc
@@ -2,6 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "content/renderer/media/media_stream_video_capturer_source.h"
+
+#include <utility>
+
#include "base/bind.h"
#include "base/callback_helpers.h"
#include "base/location.h"
@@ -10,7 +14,6 @@
#include "base/strings/utf_string_conversions.h"
#include "content/child/child_process.h"
#include "content/public/renderer/media_stream_video_sink.h"
-#include "content/renderer/media/media_stream_video_capturer_source.h"
#include "content/renderer/media/media_stream_video_track.h"
#include "content/renderer/media/mock_media_constraint_factory.h"
#include "media/base/bind_to_current_loop.h"
@@ -76,7 +79,7 @@ class MediaStreamVideoCapturerSourceTest : public testing::Test {
source_ = new MediaStreamVideoCapturerSource(
base::Bind(&MediaStreamVideoCapturerSourceTest::OnSourceStopped,
base::Unretained(this)),
- delegate.Pass());
+ std::move(delegate));
source_->SetDeviceInfo(device_info);
webkit_source_.initialize(base::UTF8ToUTF16("dummy_source_id"),
@@ -331,7 +334,7 @@ TEST_F(MediaStreamVideoCapturerSourceTest, Ended) {
source_ = new MediaStreamVideoCapturerSource(
base::Bind(&MediaStreamVideoCapturerSourceTest::OnSourceStopped,
base::Unretained(this)),
- delegate.Pass());
+ std::move(delegate));
webkit_source_.initialize(base::UTF8ToUTF16("dummy_source_id"),
blink::WebMediaStreamSource::TypeVideo,
base::UTF8ToUTF16("dummy_source_name"),
diff --git a/content/renderer/media/remote_media_stream_impl.cc b/content/renderer/media/remote_media_stream_impl.cc
index 848d6bf..b365e6d 100644
--- a/content/renderer/media/remote_media_stream_impl.cc
+++ b/content/renderer/media/remote_media_stream_impl.cc
@@ -5,8 +5,8 @@
#include "content/renderer/media/remote_media_stream_impl.h"
#include <stddef.h>
-
#include <string>
+#include <utility>
#include <vector>
#include "base/bind.h"
@@ -156,7 +156,7 @@ class RemoteVideoTrackAdapter
bool enabled) {
DCHECK(main_thread_->BelongsToCurrentThread());
scoped_ptr<MediaStreamRemoteVideoSource> video_source(
- new MediaStreamRemoteVideoSource(observer.Pass()));
+ new MediaStreamRemoteVideoSource(std::move(observer)));
InitializeWebkitTrack(blink::WebMediaStreamSource::TypeVideo);
webkit_track()->source().setExtraData(video_source.get());
// Initial constraints must be provided to a MediaStreamVideoTrack. But
@@ -327,7 +327,7 @@ void RemoteMediaStreamImpl::Observer::OnChangedOnMainThread(
scoped_ptr<RemoteVideoTrackAdapters> video_tracks) {
DCHECK(main_thread_->BelongsToCurrentThread());
if (media_stream_)
- media_stream_->OnChanged(audio_tracks.Pass(), video_tracks.Pass());
+ media_stream_->OnChanged(std::move(audio_tracks), std::move(video_tracks));
}
// Called on the signaling thread.
diff --git a/content/renderer/media/renderer_gpu_video_accelerator_factories.cc b/content/renderer/media/renderer_gpu_video_accelerator_factories.cc
index c3a0cd1..b483100 100644
--- a/content/renderer/media/renderer_gpu_video_accelerator_factories.cc
+++ b/content/renderer/media/renderer_gpu_video_accelerator_factories.cc
@@ -187,7 +187,7 @@ RendererGpuVideoAcceleratorFactories::AllocateGpuMemoryBuffer(
gfx::BufferUsage usage) {
scoped_ptr<gfx::GpuMemoryBuffer> buffer =
gpu_memory_buffer_manager_->AllocateGpuMemoryBuffer(size, format, usage);
- return buffer.Pass();
+ return buffer;
}
bool RendererGpuVideoAcceleratorFactories::
ShouldUseGpuMemoryBuffersForVideoFrames() const {
diff --git a/content/renderer/media/rtc_data_channel_handler.cc b/content/renderer/media/rtc_data_channel_handler.cc
index 9dba433..dfdb432 100644
--- a/content/renderer/media/rtc_data_channel_handler.cc
+++ b/content/renderer/media/rtc_data_channel_handler.cc
@@ -6,6 +6,7 @@
#include <limits>
#include <string>
+#include <utility>
#include "base/bind.h"
#include "base/location.h"
@@ -122,7 +123,7 @@ void RtcDataChannelHandler::Observer::OnMessageImpl(
scoped_ptr<webrtc::DataBuffer> buffer) {
DCHECK(main_thread_->BelongsToCurrentThread());
if (handler_)
- handler_->OnMessage(buffer.Pass());
+ handler_->OnMessage(std::move(buffer));
}
RtcDataChannelHandler::RtcDataChannelHandler(
diff --git a/content/renderer/media/rtc_peer_connection_handler.cc b/content/renderer/media/rtc_peer_connection_handler.cc
index f254738..47e3782 100644
--- a/content/renderer/media/rtc_peer_connection_handler.cc
+++ b/content/renderer/media/rtc_peer_connection_handler.cc
@@ -770,7 +770,7 @@ class RTCPeerConnectionHandler::Observer
void OnAddStreamImpl(scoped_ptr<RemoteMediaStreamImpl> stream) {
DCHECK(stream->webkit_stream().extraData()) << "Initialization not done";
if (handler_)
- handler_->OnAddStream(stream.Pass());
+ handler_->OnAddStream(std::move(stream));
}
void OnRemoveStreamImpl(const scoped_refptr<MediaStreamInterface>& stream) {
@@ -780,7 +780,7 @@ class RTCPeerConnectionHandler::Observer
void OnDataChannelImpl(scoped_ptr<RtcDataChannelHandler> handler) {
if (handler_)
- handler_->OnDataChannel(handler.Pass());
+ handler_->OnDataChannel(std::move(handler));
}
void OnIceCandidateImpl(const std::string& sdp, const std::string& sdp_mid,
diff --git a/content/renderer/media/rtc_video_decoder.cc b/content/renderer/media/rtc_video_decoder.cc
index fff132c..de91b6e 100644
--- a/content/renderer/media/rtc_video_decoder.cc
+++ b/content/renderer/media/rtc_video_decoder.cc
@@ -4,6 +4,8 @@
#include "content/renderer/media/rtc_video_decoder.h"
+#include <utility>
+
#include "base/bind.h"
#include "base/logging.h"
#include "base/memory/ref_counted.h"
@@ -96,7 +98,7 @@ scoped_ptr<RTCVideoDecoder> RTCVideoDecoder::Create(
break;
default:
DVLOG(2) << "Video codec not supported:" << type;
- return decoder.Pass();
+ return decoder;
}
base::WaitableEvent waiter(true, false);
@@ -113,7 +115,7 @@ scoped_ptr<RTCVideoDecoder> RTCVideoDecoder::Create(
decoder->state_ = INITIALIZED;
else
factories->GetTaskRunner()->DeleteSoon(FROM_HERE, decoder.release());
- return decoder.Pass();
+ return decoder;
}
// static
@@ -239,7 +241,7 @@ int32_t RTCVideoDecoder::Decode(
return WEBRTC_VIDEO_CODEC_OK;
}
- SaveToDecodeBuffers_Locked(inputImage, shm_buffer.Pass(), buffer_data);
+ SaveToDecodeBuffers_Locked(inputImage, std::move(shm_buffer), buffer_data);
factories_->GetTaskRunner()->PostTask(
FROM_HERE,
base::Bind(&RTCVideoDecoder::RequestBufferDecode,
@@ -499,7 +501,7 @@ void RTCVideoDecoder::RequestBufferDecode() {
// Drop the buffers before Reset or Release is called.
if (!IsBufferAfterReset(buffer_data.bitstream_buffer_id,
reset_bitstream_buffer_id_)) {
- PutSHM_Locked(shm_buffer.Pass());
+ PutSHM_Locked(std::move(shm_buffer));
continue;
}
}
@@ -597,7 +599,7 @@ void RTCVideoDecoder::MovePendingBuffersToDecodeBuffers() {
GetSHM_Locked(input_image._length);
if (!shm_buffer)
return;
- SaveToDecodeBuffers_Locked(input_image, shm_buffer.Pass(), buffer_data);
+ SaveToDecodeBuffers_Locked(input_image, std::move(shm_buffer), buffer_data);
delete[] input_image._buffer;
pending_buffers_.pop_front();
}
@@ -759,7 +761,7 @@ void RTCVideoDecoder::CreateSHM(size_t count, size_t size) {
}
base::AutoLock auto_lock(lock_);
- PutSHM_Locked(shm.Pass());
+ PutSHM_Locked(std::move(shm));
++num_shm_buffers_;
}
diff --git a/content/renderer/media/rtc_video_encoder.cc b/content/renderer/media/rtc_video_encoder.cc
index 3e37253..f586a89 100644
--- a/content/renderer/media/rtc_video_encoder.cc
+++ b/content/renderer/media/rtc_video_encoder.cc
@@ -257,7 +257,7 @@ void RTCVideoEncoder::Impl::CreateAndInitializeVEA(
if (IsBitrateTooHigh(bitrate))
return;
- video_encoder_ = gpu_factories_->CreateVideoEncodeAccelerator().Pass();
+ video_encoder_ = gpu_factories_->CreateVideoEncodeAccelerator();
if (!video_encoder_) {
LogAndNotifyError(FROM_HERE, "Error creating VideoEncodeAccelerator",
media::VideoEncodeAccelerator::kPlatformFailureError);
diff --git a/content/renderer/media/speech_recognition_audio_sink.cc b/content/renderer/media/speech_recognition_audio_sink.cc
index 6370df2..1035aff 100644
--- a/content/renderer/media/speech_recognition_audio_sink.cc
+++ b/content/renderer/media/speech_recognition_audio_sink.cc
@@ -5,6 +5,7 @@
#include "content/renderer/media/speech_recognition_audio_sink.h"
#include <stddef.h>
+#include <utility>
#include "base/logging.h"
#include "base/memory/shared_memory.h"
@@ -23,7 +24,7 @@ SpeechRecognitionAudioSink::SpeechRecognitionAudioSink(
const OnStoppedCB& on_stopped_cb)
: track_(track),
shared_memory_(memory, false),
- socket_(socket.Pass()),
+ socket_(std::move(socket)),
output_params_(params),
track_stopped_(false),
buffer_index_(0),
diff --git a/content/renderer/media/speech_recognition_audio_sink_unittest.cc b/content/renderer/media/speech_recognition_audio_sink_unittest.cc
index af3b66a..64ee434 100644
--- a/content/renderer/media/speech_recognition_audio_sink_unittest.cc
+++ b/content/renderer/media/speech_recognition_audio_sink_unittest.cc
@@ -7,6 +7,7 @@
#include <stddef.h>
#include <stdint.h>
#include <string.h>
+#include <utility>
#include "base/bind.h"
#include "base/macros.h"
@@ -255,7 +256,7 @@ class SpeechRecognitionAudioSinkTest : public testing::Test {
scoped_ptr<base::SyncSocket> sending_socket(recognizer_->sending_socket());
speech_audio_sink_.reset(new SpeechRecognitionAudioSink(
blink_track, sink_params_, foreign_memory_handle,
- sending_socket.Pass(),
+ std::move(sending_socket),
base::Bind(&SpeechRecognitionAudioSinkTest::StoppedCallback,
base::Unretained(this))));
diff --git a/content/renderer/media/user_media_client_impl.cc b/content/renderer/media/user_media_client_impl.cc
index d60046a..204e631 100644
--- a/content/renderer/media/user_media_client_impl.cc
+++ b/content/renderer/media/user_media_client_impl.cc
@@ -169,7 +169,7 @@ UserMediaClientImpl::UserMediaClientImpl(
scoped_ptr<MediaStreamDispatcher> media_stream_dispatcher)
: RenderFrameObserver(render_frame),
dependency_factory_(dependency_factory),
- media_stream_dispatcher_(media_stream_dispatcher.Pass()),
+ media_stream_dispatcher_(std::move(media_stream_dispatcher)),
weak_factory_(this) {
DCHECK(dependency_factory_);
DCHECK(media_stream_dispatcher_.get());
diff --git a/content/renderer/media/user_media_client_impl_unittest.cc b/content/renderer/media/user_media_client_impl_unittest.cc
index 624743c..a9d1911 100644
--- a/content/renderer/media/user_media_client_impl_unittest.cc
+++ b/content/renderer/media/user_media_client_impl_unittest.cc
@@ -2,7 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "content/renderer/media/user_media_client_impl.h"
+
#include <stddef.h>
+#include <utility>
#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h"
@@ -12,7 +15,6 @@
#include "content/renderer/media/media_stream_track.h"
#include "content/renderer/media/mock_media_stream_dispatcher.h"
#include "content/renderer/media/mock_media_stream_video_source.h"
-#include "content/renderer/media/user_media_client_impl.h"
#include "content/renderer/media/webrtc/mock_peer_connection_dependency_factory.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/WebKit/public/platform/WebMediaDeviceInfo.h"
@@ -50,14 +52,14 @@ class UserMediaClientImplUnderTest : public UserMediaClientImpl {
UserMediaClientImplUnderTest(
PeerConnectionDependencyFactory* dependency_factory,
scoped_ptr<MediaStreamDispatcher> media_stream_dispatcher)
- : UserMediaClientImpl(
- NULL, dependency_factory, media_stream_dispatcher.Pass()),
+ : UserMediaClientImpl(NULL,
+ dependency_factory,
+ std::move(media_stream_dispatcher)),
state_(REQUEST_NOT_STARTED),
result_(NUM_MEDIA_REQUEST_RESULTS),
result_name_(""),
factory_(dependency_factory),
- video_source_(NULL) {
- }
+ video_source_(NULL) {}
void RequestUserMedia() {
blink::WebUserMediaRequest user_media_request;
@@ -161,7 +163,7 @@ class UserMediaClientImplTest : public ::testing::Test {
ms_dispatcher_ = new MockMediaStreamDispatcher();
used_media_impl_.reset(new UserMediaClientImplUnderTest(
dependency_factory_.get(),
- scoped_ptr<MediaStreamDispatcher>(ms_dispatcher_).Pass()));
+ scoped_ptr<MediaStreamDispatcher>(ms_dispatcher_)));
}
void TearDown() override {
diff --git a/content/renderer/media/video_capture_impl.cc b/content/renderer/media/video_capture_impl.cc
index 67957d4..aa06bd7 100644
--- a/content/renderer/media/video_capture_impl.cc
+++ b/content/renderer/media/video_capture_impl.cc
@@ -12,6 +12,7 @@
#include "content/renderer/media/video_capture_impl.h"
#include <stddef.h>
+#include <utility>
#include "base/bind.h"
#include "base/macros.h"
@@ -31,7 +32,7 @@ class VideoCaptureImpl::ClientBuffer
: public base::RefCountedThreadSafe<ClientBuffer> {
public:
ClientBuffer(scoped_ptr<base::SharedMemory> buffer, size_t buffer_size)
- : buffer_(buffer.Pass()), buffer_size_(buffer_size) {}
+ : buffer_(std::move(buffer)), buffer_size_(buffer_size) {}
base::SharedMemory* buffer() const { return buffer_.get(); }
size_t buffer_size() const { return buffer_size_; }
@@ -251,8 +252,9 @@ void VideoCaptureImpl::OnBufferCreated(base::SharedMemoryHandle handle,
return;
}
const bool inserted =
- client_buffers_.insert(std::make_pair(buffer_id, new ClientBuffer(
- shm.Pass(), length)))
+ client_buffers_.insert(std::make_pair(
+ buffer_id,
+ new ClientBuffer(std::move(shm), length)))
.second;
DCHECK(inserted);
}
diff --git a/content/renderer/media/video_track_recorder.cc b/content/renderer/media/video_track_recorder.cc
index 21b563d..9c923cc 100644
--- a/content/renderer/media/video_track_recorder.cc
+++ b/content/renderer/media/video_track_recorder.cc
@@ -4,6 +4,8 @@
#include "content/renderer/media/video_track_recorder.h"
+#include <utility>
+
#include "base/bind.h"
#include "base/logging.h"
#include "base/macros.h"
@@ -53,7 +55,7 @@ void OnFrameEncodeCompleted(
bool keyframe) {
DVLOG(1) << (keyframe ? "" : "non ") << "keyframe "<< data->length() << "B, "
<< capture_timestamp << " ms";
- on_encoded_video_cb.Run(frame, data.Pass(), capture_timestamp, keyframe);
+ on_encoded_video_cb.Run(frame, std::move(data), capture_timestamp, keyframe);
}
} // anonymous namespace
diff --git a/content/renderer/media/webmediaplayer_ms.cc b/content/renderer/media/webmediaplayer_ms.cc
index 392d20e..e302d9d 100644
--- a/content/renderer/media/webmediaplayer_ms.cc
+++ b/content/renderer/media/webmediaplayer_ms.cc
@@ -5,9 +5,9 @@
#include "content/renderer/media/webmediaplayer_ms.h"
#include <stddef.h>
-
#include <limits>
#include <string>
+#include <utility>
#include "base/bind.h"
#include "base/callback.h"
@@ -61,7 +61,7 @@ WebMediaPlayerMS::WebMediaPlayerMS(
render_frame_suspended_(false),
received_first_frame_(false),
media_log_(media_log),
- renderer_factory_(factory.Pass()),
+ renderer_factory_(std::move(factory)),
media_task_runner_(media_task_runner),
worker_task_runner_(worker_task_runner),
gpu_factories_(gpu_factories),
diff --git a/content/renderer/media/webrtc/media_stream_remote_video_source.cc b/content/renderer/media/webrtc/media_stream_remote_video_source.cc
index 05cc12a..1ee27ee 100644
--- a/content/renderer/media/webrtc/media_stream_remote_video_source.cc
+++ b/content/renderer/media/webrtc/media_stream_remote_video_source.cc
@@ -5,6 +5,7 @@
#include "content/renderer/media/webrtc/media_stream_remote_video_source.h"
#include <stdint.h>
+#include <utility>
#include "base/bind.h"
#include "base/callback_helpers.h"
@@ -141,7 +142,7 @@ RemoteVideoSourceDelegate::DoRenderFrameOnIOThread(
MediaStreamRemoteVideoSource::MediaStreamRemoteVideoSource(
scoped_ptr<TrackObserver> observer)
- : observer_(observer.Pass()) {
+ : observer_(std::move(observer)) {
// The callback will be automatically cleared when 'observer_' goes out of
// scope and no further callbacks will occur.
observer_->SetCallback(base::Bind(&MediaStreamRemoteVideoSource::OnChanged,
diff --git a/content/renderer/media/webrtc/media_stream_remote_video_source_unittest.cc b/content/renderer/media/webrtc/media_stream_remote_video_source_unittest.cc
index 4a1f46b..b5fcae5 100644
--- a/content/renderer/media/webrtc/media_stream_remote_video_source_unittest.cc
+++ b/content/renderer/media/webrtc/media_stream_remote_video_source_unittest.cc
@@ -2,6 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "content/renderer/media/webrtc/media_stream_remote_video_source.h"
+
+#include <utility>
+
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "base/strings/utf_string_conversions.h"
@@ -9,7 +13,6 @@
#include "content/child/child_process.h"
#include "content/renderer/media/media_stream_video_track.h"
#include "content/renderer/media/mock_media_stream_video_sink.h"
-#include "content/renderer/media/webrtc/media_stream_remote_video_source.h"
#include "content/renderer/media/webrtc/mock_peer_connection_dependency_factory.h"
#include "content/renderer/media/webrtc/track_observer.h"
#include "media/base/video_frame.h"
@@ -28,8 +31,7 @@ class MediaStreamRemoteVideoSourceUnderTest
public:
explicit MediaStreamRemoteVideoSourceUnderTest(
scoped_ptr<TrackObserver> observer)
- : MediaStreamRemoteVideoSource(observer.Pass()) {
- }
+ : MediaStreamRemoteVideoSource(std::move(observer)) {}
using MediaStreamRemoteVideoSource::RenderInterfaceForTest;
};
@@ -42,10 +44,10 @@ class MediaStreamRemoteVideoSourceTest
webrtc_video_track_(mock_factory_->CreateLocalVideoTrack(
"test",
static_cast<cricket::VideoCapturer*>(NULL))),
- remote_source_(new MediaStreamRemoteVideoSourceUnderTest(
- scoped_ptr<TrackObserver>(
+ remote_source_(
+ new MediaStreamRemoteVideoSourceUnderTest(scoped_ptr<TrackObserver>(
new TrackObserver(base::ThreadTaskRunnerHandle::Get(),
- webrtc_video_track_.get())).Pass())),
+ webrtc_video_track_.get())))),
number_of_successful_constraints_applied_(0),
number_of_failed_constraints_applied_(0) {
webkit_source_.initialize(base::UTF8ToUTF16("dummy_source_id"),
diff --git a/content/renderer/media/webrtc_audio_renderer.cc b/content/renderer/media/webrtc_audio_renderer.cc
index 5b48a37..f0ce3f0 100644
--- a/content/renderer/media/webrtc_audio_renderer.cc
+++ b/content/renderer/media/webrtc_audio_renderer.cc
@@ -4,6 +4,8 @@
#include "content/renderer/media/webrtc_audio_renderer.h"
+#include <utility>
+
#include "base/logging.h"
#include "base/metrics/histogram.h"
#include "base/strings/string_util.h"
@@ -652,7 +654,7 @@ void WebRtcAudioRenderer::PrepareSink() {
sink_params_ = new_sink_params;
fifo_delay_milliseconds_ = new_fifo_delay_milliseconds;
if (new_audio_fifo.get())
- audio_fifo_ = new_audio_fifo.Pass();
+ audio_fifo_ = std::move(new_audio_fifo);
}
sink_->Initialize(new_sink_params, this);
diff --git a/content/renderer/media/webrtc_audio_renderer_unittest.cc b/content/renderer/media/webrtc_audio_renderer_unittest.cc
index 8260874..86710d5 100644
--- a/content/renderer/media/webrtc_audio_renderer_unittest.cc
+++ b/content/renderer/media/webrtc_audio_renderer_unittest.cc
@@ -2,7 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "content/renderer/media/webrtc_audio_renderer.h"
+
#include <string>
+#include <utility>
#include <vector>
#include "base/run_loop.h"
@@ -13,7 +16,6 @@
#include "content/renderer/media/audio_message_filter.h"
#include "content/renderer/media/webrtc/mock_peer_connection_dependency_factory.h"
#include "content/renderer/media/webrtc_audio_device_impl.h"
-#include "content/renderer/media/webrtc_audio_renderer.h"
#include "media/audio/audio_output_device.h"
#include "media/audio/audio_output_ipc.h"
#include "media/base/audio_bus.h"
@@ -67,7 +69,7 @@ class FakeAudioOutputDevice
scoped_ptr<media::AudioOutputIPC> ipc,
const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner,
const std::string& device_id)
- : AudioOutputDevice(ipc.Pass(),
+ : AudioOutputDevice(std::move(ipc),
io_task_runner,
0,
std::string(),
diff --git a/content/renderer/media/webrtc_local_audio_renderer.cc b/content/renderer/media/webrtc_local_audio_renderer.cc
index 8f0f2ed..f39a017 100644
--- a/content/renderer/media/webrtc_local_audio_renderer.cc
+++ b/content/renderer/media/webrtc_local_audio_renderer.cc
@@ -4,6 +4,8 @@
#include "content/renderer/media/webrtc_local_audio_renderer.h"
+#include <utility>
+
#include "base/location.h"
#include "base/logging.h"
#include "base/metrics/histogram.h"
@@ -70,7 +72,7 @@ void WebRtcLocalAudioRenderer::OnData(const media::AudioBus& audio_bus,
scoped_ptr<media::AudioBus> audio_data(
media::AudioBus::Create(audio_bus.channels(), audio_bus.frames()));
audio_bus.CopyTo(audio_data.get());
- audio_shifter_->Push(audio_data.Pass(), estimated_capture_time);
+ audio_shifter_->Push(std::move(audio_data), estimated_capture_time);
const base::TimeTicks now = base::TimeTicks::Now();
total_render_time_ += now - last_render_time_;
last_render_time_ = now;
diff --git a/content/renderer/mojo/service_registry_js_wrapper.cc b/content/renderer/mojo/service_registry_js_wrapper.cc
index 4840b1e..b91a162 100644
--- a/content/renderer/mojo/service_registry_js_wrapper.cc
+++ b/content/renderer/mojo/service_registry_js_wrapper.cc
@@ -4,6 +4,8 @@
#include "content/renderer/mojo/service_registry_js_wrapper.h"
+#include <utility>
+
#include "content/common/mojo/service_registry_impl.h"
#include "content/public/common/service_registry.h"
#include "third_party/mojo/src/mojo/edk/js/handle.h"
@@ -40,7 +42,7 @@ mojo::Handle ServiceRegistryJsWrapper::ConnectToService(
mojo::MessagePipe pipe;
if (service_registry_)
service_registry_->ConnectToRemoteService(service_name,
- pipe.handle0.Pass());
+ std::move(pipe.handle0));
return pipe.handle1.release();
}
diff --git a/content/renderer/p2p/filtering_network_manager.cc b/content/renderer/p2p/filtering_network_manager.cc
index 44fe659..a835ab8 100644
--- a/content/renderer/p2p/filtering_network_manager.cc
+++ b/content/renderer/p2p/filtering_network_manager.cc
@@ -4,6 +4,8 @@
#include "content/renderer/p2p/filtering_network_manager.h"
+#include <utility>
+
#include "base/bind.h"
#include "base/location.h"
#include "base/logging.h"
@@ -17,7 +19,7 @@ FilteringNetworkManager::FilteringNetworkManager(
const GURL& requesting_origin,
scoped_ptr<media::MediaPermission> media_permission)
: network_manager_(network_manager),
- media_permission_(media_permission.Pass()),
+ media_permission_(std::move(media_permission)),
requesting_origin_(requesting_origin),
weak_ptr_factory_(this) {
thread_checker_.DetachFromThread();
diff --git a/content/renderer/p2p/filtering_network_manager_unittest.cc b/content/renderer/p2p/filtering_network_manager_unittest.cc
index c5bb5e9..29d89e3 100644
--- a/content/renderer/p2p/filtering_network_manager_unittest.cc
+++ b/content/renderer/p2p/filtering_network_manager_unittest.cc
@@ -5,6 +5,7 @@
#include "content/renderer/p2p/filtering_network_manager.h"
#include <stddef.h>
+#include <utility>
#include "base/logging.h"
#include "base/macros.h"
@@ -136,7 +137,7 @@ class FilteringNetworkManagerTest : public testing::Test,
if (multiple_routes_requested) {
FilteringNetworkManager* filtering_network_manager =
new FilteringNetworkManager(mock_network_manager_.get(), GURL(),
- media_permission.Pass());
+ std::move(media_permission));
filtering_network_manager->Initialize();
network_manager_.reset(filtering_network_manager);
} else {
diff --git a/content/renderer/p2p/port_allocator.cc b/content/renderer/p2p/port_allocator.cc
index c4ba18b..89d3b91 100644
--- a/content/renderer/p2p/port_allocator.cc
+++ b/content/renderer/p2p/port_allocator.cc
@@ -5,6 +5,7 @@
#include "content/renderer/p2p/port_allocator.h"
#include <stdint.h>
+#include <utility>
#include "base/command_line.h"
#include "base/logging.h"
@@ -21,7 +22,7 @@ P2PPortAllocator::P2PPortAllocator(
const GURL& origin,
const scoped_refptr<base::SingleThreadTaskRunner> task_runner)
: cricket::BasicPortAllocator(network_manager.get(), socket_factory),
- network_manager_(network_manager.Pass()),
+ network_manager_(std::move(network_manager)),
socket_dispatcher_(socket_dispatcher),
config_(config),
origin_(origin),
diff --git a/content/renderer/pepper/content_decryptor_delegate.cc b/content/renderer/pepper/content_decryptor_delegate.cc
index 5766905..fbead03 100644
--- a/content/renderer/pepper/content_decryptor_delegate.cc
+++ b/content/renderer/pepper/content_decryptor_delegate.cc
@@ -5,7 +5,7 @@
#include "content/renderer/pepper/content_decryptor_delegate.h"
#include <string.h>
-
+#include <utility>
#include <vector>
#include "base/callback_helpers.h"
@@ -398,7 +398,7 @@ void ContentDecryptorDelegate::Initialize(
session_expiration_update_cb_ = session_expiration_update_cb;
fatal_plugin_error_cb_ = fatal_plugin_error_cb;
- uint32_t promise_id = cdm_promise_adapter_.SavePromise(promise.Pass());
+ uint32_t promise_id = cdm_promise_adapter_.SavePromise(std::move(promise));
plugin_decryption_interface_->Initialize(
pp_instance_, promise_id, StringVar::StringToPPVar(key_system_),
PP_FromBool(allow_distinctive_identifier),
@@ -420,7 +420,7 @@ void ContentDecryptorDelegate::SetServerCertificate(
return;
}
- uint32_t promise_id = cdm_promise_adapter_.SavePromise(promise.Pass());
+ uint32_t promise_id = cdm_promise_adapter_.SavePromise(std::move(promise));
PP_Var certificate_array =
PpapiGlobals::Get()->GetVarTracker()->MakeArrayBufferPPVar(
base::checked_cast<uint32_t>(certificate.size()), certificate.data());
@@ -433,7 +433,7 @@ void ContentDecryptorDelegate::CreateSessionAndGenerateRequest(
media::EmeInitDataType init_data_type,
const std::vector<uint8_t>& init_data,
scoped_ptr<NewSessionCdmPromise> promise) {
- uint32_t promise_id = cdm_promise_adapter_.SavePromise(promise.Pass());
+ uint32_t promise_id = cdm_promise_adapter_.SavePromise(std::move(promise));
PP_Var init_data_array =
PpapiGlobals::Get()->GetVarTracker()->MakeArrayBufferPPVar(
base::checked_cast<uint32_t>(init_data.size()), init_data.data());
@@ -446,7 +446,7 @@ void ContentDecryptorDelegate::LoadSession(
media::MediaKeys::SessionType session_type,
const std::string& session_id,
scoped_ptr<NewSessionCdmPromise> promise) {
- uint32_t promise_id = cdm_promise_adapter_.SavePromise(promise.Pass());
+ uint32_t promise_id = cdm_promise_adapter_.SavePromise(std::move(promise));
plugin_decryption_interface_->LoadSession(
pp_instance_, promise_id, MediaSessionTypeToPpSessionType(session_type),
StringVar::StringToPPVar(session_id));
@@ -456,7 +456,7 @@ void ContentDecryptorDelegate::UpdateSession(
const std::string& session_id,
const std::vector<uint8_t>& response,
scoped_ptr<SimpleCdmPromise> promise) {
- uint32_t promise_id = cdm_promise_adapter_.SavePromise(promise.Pass());
+ uint32_t promise_id = cdm_promise_adapter_.SavePromise(std::move(promise));
PP_Var response_array =
PpapiGlobals::Get()->GetVarTracker()->MakeArrayBufferPPVar(
base::checked_cast<uint32_t>(response.size()), response.data());
@@ -474,7 +474,7 @@ void ContentDecryptorDelegate::CloseSession(
return;
}
- uint32_t promise_id = cdm_promise_adapter_.SavePromise(promise.Pass());
+ uint32_t promise_id = cdm_promise_adapter_.SavePromise(std::move(promise));
plugin_decryption_interface_->CloseSession(
pp_instance_, promise_id, StringVar::StringToPPVar(session_id));
}
@@ -488,7 +488,7 @@ void ContentDecryptorDelegate::RemoveSession(
return;
}
- uint32_t promise_id = cdm_promise_adapter_.SavePromise(promise.Pass());
+ uint32_t promise_id = cdm_promise_adapter_.SavePromise(std::move(promise));
plugin_decryption_interface_->RemoveSession(
pp_instance_, promise_id, StringVar::StringToPPVar(session_id));
}
@@ -819,7 +819,7 @@ void ContentDecryptorDelegate::OnSessionKeysChange(
session_keys_change_cb_.Run(session_id_string->value(),
PP_ToBool(has_additional_usable_key),
- keys_info.Pass());
+ std::move(keys_info));
}
void ContentDecryptorDelegate::OnSessionExpirationChange(
diff --git a/content/renderer/pepper/content_renderer_pepper_host_factory.cc b/content/renderer/pepper/content_renderer_pepper_host_factory.cc
index 3b18143..fc216e1 100644
--- a/content/renderer/pepper/content_renderer_pepper_host_factory.cc
+++ b/content/renderer/pepper/content_renderer_pepper_host_factory.cc
@@ -4,6 +4,8 @@
#include "content/renderer/pepper/content_renderer_pepper_host_factory.h"
+#include <utility>
+
#include "base/logging.h"
#include "base/strings/string_util.h"
#include "build/build_config.h"
@@ -232,7 +234,7 @@ scoped_ptr<ResourceHost> ContentRendererPepperHostFactory::CreateResourceHost(
return nullptr;
scoped_ptr<PepperCameraDeviceHost> host(
new PepperCameraDeviceHost(host_, instance, resource));
- return host->Init() ? host.Pass() : nullptr;
+ return host->Init() ? std::move(host) : nullptr;
}
return scoped_ptr<ResourceHost>();
diff --git a/content/renderer/pepper/pepper_audio_encoder_host.cc b/content/renderer/pepper/pepper_audio_encoder_host.cc
index e6b69c6..e7d3ca5 100644
--- a/content/renderer/pepper/pepper_audio_encoder_host.cc
+++ b/content/renderer/pepper/pepper_audio_encoder_host.cc
@@ -2,14 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "content/renderer/pepper/pepper_audio_encoder_host.h"
+
#include <stddef.h>
+#include <utility>
#include "base/bind.h"
#include "base/macros.h"
#include "base/memory/shared_memory.h"
#include "content/public/renderer/renderer_ppapi_host.h"
#include "content/renderer/pepper/host_globals.h"
-#include "content/renderer/pepper/pepper_audio_encoder_host.h"
#include "content/renderer/render_thread_impl.h"
#include "media/base/bind_to_current_loop.h"
#include "ppapi/c/pp_codecs.h"
@@ -371,7 +373,7 @@ bool PepperAudioEncoderHost::AllocateBuffers(
new ppapi::MediaStreamBufferManager(this));
if (!audio_buffer_manager->SetBuffers(kDefaultNumberOfAudioBuffers,
total_audio_buffer_size.ValueOrDie(),
- audio_memory.Pass(), false))
+ std::move(audio_memory), false))
return false;
for (int32_t i = 0; i < audio_buffer_manager->number_of_buffers(); ++i) {
@@ -395,7 +397,7 @@ bool PepperAudioEncoderHost::AllocateBuffers(
new ppapi::MediaStreamBufferManager(this));
if (!bitstream_buffer_manager->SetBuffers(kDefaultNumberOfAudioBuffers,
bitstream_buffer_size.ValueOrDie(),
- bitstream_memory.Pass(), true))
+ std::move(bitstream_memory), true))
return false;
for (int32_t i = 0; i < bitstream_buffer_manager->number_of_buffers(); ++i) {
@@ -484,9 +486,10 @@ void PepperAudioEncoderHost::Close() {
// Destroy the encoder and the audio/bitstream buffers on the media thread
// to avoid freeing memory the encoder might still be working on.
media_task_runner_->PostTask(
- FROM_HERE, base::Bind(&StopAudioEncoder, base::Passed(encoder_.Pass()),
- base::Passed(audio_buffer_manager_.Pass()),
- base::Passed(bitstream_buffer_manager_.Pass())));
+ FROM_HERE,
+ base::Bind(&StopAudioEncoder, base::Passed(std::move(encoder_)),
+ base::Passed(std::move(audio_buffer_manager_)),
+ base::Passed(std::move(bitstream_buffer_manager_))));
}
// static
diff --git a/content/renderer/pepper/pepper_compositor_host.cc b/content/renderer/pepper/pepper_compositor_host.cc
index 3f8b34c..939cd98 100644
--- a/content/renderer/pepper/pepper_compositor_host.cc
+++ b/content/renderer/pepper/pepper_compositor_host.cc
@@ -5,8 +5,8 @@
#include "content/renderer/pepper/pepper_compositor_host.h"
#include <stddef.h>
-
#include <limits>
+#include <utility>
#include "base/logging.h"
#include "base/memory/shared_memory.h"
@@ -392,7 +392,7 @@ int32_t PepperCompositorHost::OnHostMsgCommitLayers(
layer_->AddChild(cc_layer);
}
- UpdateLayer(cc_layer, old_layer, pp_layer, image_shms[i].Pass());
+ UpdateLayer(cc_layer, old_layer, pp_layer, std::move(image_shms[i]));
if (old_layer)
*old_layer = *pp_layer;
diff --git a/content/renderer/pepper/pepper_graphics_2d_host.cc b/content/renderer/pepper/pepper_graphics_2d_host.cc
index f33792d..c6451a1 100644
--- a/content/renderer/pepper/pepper_graphics_2d_host.cc
+++ b/content/renderer/pepper/pepper_graphics_2d_host.cc
@@ -5,6 +5,7 @@
#include "content/renderer/pepper/pepper_graphics_2d_host.h"
#include <stddef.h>
+#include <utility>
#include "base/bind.h"
#include "base/location.h"
@@ -553,7 +554,7 @@ void PepperGraphics2DHost::ReleaseCallback(scoped_ptr<cc::SharedBitmap> bitmap,
// Only keep around a cached bitmap if the plugin is currently drawing (has
// need_flush_ack_ set).
if (need_flush_ack_ && bound_instance_)
- cached_bitmap_ = bitmap.Pass();
+ cached_bitmap_ = std::move(bitmap);
cached_bitmap_size_ = bitmap_size;
}
@@ -567,7 +568,7 @@ bool PepperGraphics2DHost::PrepareTextureMailbox(
scoped_ptr<cc::SharedBitmap> shared_bitmap;
if (cached_bitmap_) {
if (cached_bitmap_size_ == pixel_image_size)
- shared_bitmap = cached_bitmap_.Pass();
+ shared_bitmap = std::move(cached_bitmap_);
else
cached_bitmap_.reset();
}
diff --git a/content/renderer/pepper/pepper_media_stream_track_host_base.cc b/content/renderer/pepper/pepper_media_stream_track_host_base.cc
index 7846bfd..6bc9cd7 100644
--- a/content/renderer/pepper/pepper_media_stream_track_host_base.cc
+++ b/content/renderer/pepper/pepper_media_stream_track_host_base.cc
@@ -4,6 +4,8 @@
#include "content/renderer/pepper/pepper_media_stream_track_host_base.h"
+#include <utility>
+
#include "base/logging.h"
#include "base/numerics/safe_math.h"
#include "content/common/pepper_file_util.h"
@@ -51,15 +53,14 @@ bool PepperMediaStreamTrackHostBase::InitBuffers(int32_t number_of_buffers,
content::RenderThread* render_thread = content::RenderThread::Get();
scoped_ptr<base::SharedMemory> shm(
- render_thread->HostAllocateSharedMemoryBuffer(size.ValueOrDie()).Pass());
+ render_thread->HostAllocateSharedMemoryBuffer(size.ValueOrDie()));
if (!shm)
return false;
base::SharedMemoryHandle shm_handle = shm->handle();
if (!buffer_manager_.SetBuffers(number_of_buffers,
buffer_size_aligned.ValueOrDie(),
- shm.Pass(),
- true)) {
+ std::move(shm), true)) {
return false;
}
diff --git a/content/renderer/pepper/pepper_plugin_instance_impl.cc b/content/renderer/pepper/pepper_plugin_instance_impl.cc
index 5866076..eee3222 100644
--- a/content/renderer/pepper/pepper_plugin_instance_impl.cc
+++ b/content/renderer/pepper/pepper_plugin_instance_impl.cc
@@ -4,6 +4,8 @@
#include "content/renderer/pepper/pepper_plugin_instance_impl.h"
+#include <utility>
+
#include "base/bind.h"
#include "base/callback_helpers.h"
#include "base/location.h"
@@ -309,7 +311,7 @@ scoped_ptr<const char* []> StringVectorToArgArray(
scoped_ptr<const char * []> array(new const char* [vector.size()]);
for (size_t i = 0; i < vector.size(); ++i)
array[i] = vector[i].c_str();
- return array.Pass();
+ return array;
}
// Returns true if this is a "system reserved" key which should not be sent to
@@ -809,7 +811,7 @@ bool PepperPluginInstanceImpl::Initialize(
return false;
if (throttler) {
- throttler_ = throttler.Pass();
+ throttler_ = std::move(throttler);
throttler_->AddObserver(this);
}
diff --git a/content/renderer/pepper/pepper_video_decoder_host.cc b/content/renderer/pepper/pepper_video_decoder_host.cc
index 50403a6..c262b57 100644
--- a/content/renderer/pepper/pepper_video_decoder_host.cc
+++ b/content/renderer/pepper/pepper_video_decoder_host.cc
@@ -191,7 +191,7 @@ int32_t PepperVideoDecoderHost::OnHostMsgGetShm(
content::RenderThread* render_thread = content::RenderThread::Get();
scoped_ptr<base::SharedMemory> shm(
- render_thread->HostAllocateSharedMemoryBuffer(shm_size).Pass());
+ render_thread->HostAllocateSharedMemoryBuffer(shm_size));
if (!shm || !shm->Map(shm_size))
return PP_ERROR_FAILED;
diff --git a/content/renderer/pepper/pepper_video_encoder_host.cc b/content/renderer/pepper/pepper_video_encoder_host.cc
index 1bb34a2..d976368 100644
--- a/content/renderer/pepper/pepper_video_encoder_host.cc
+++ b/content/renderer/pepper/pepper_video_encoder_host.cc
@@ -2,6 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "content/renderer/pepper/pepper_video_encoder_host.h"
+
+#include <utility>
+
#include "base/bind.h"
#include "base/memory/shared_memory.h"
#include "base/numerics/safe_math.h"
@@ -12,7 +16,6 @@
#include "content/public/renderer/renderer_ppapi_host.h"
#include "content/renderer/pepper/gfx_conversion.h"
#include "content/renderer/pepper/host_globals.h"
-#include "content/renderer/pepper/pepper_video_encoder_host.h"
#include "content/renderer/pepper/video_encoder_shim.h"
#include "content/renderer/render_thread_impl.h"
#include "media/base/bind_to_current_loop.h"
@@ -174,7 +177,7 @@ bool PP_HardwareAccelerationCompatible(bool accelerated,
PepperVideoEncoderHost::ShmBuffer::ShmBuffer(uint32_t id,
scoped_ptr<base::SharedMemory> shm)
- : id(id), shm(shm.Pass()), in_use(true) {
+ : id(id), shm(std::move(shm)), in_use(true) {
DCHECK(this->shm);
}
@@ -374,16 +377,15 @@ void PepperVideoEncoderHost::RequireBitstreamBuffers(
for (uint32_t i = 0; i < kDefaultNumberOfBitstreamBuffers; ++i) {
scoped_ptr<base::SharedMemory> shm(
- RenderThread::Get()
- ->HostAllocateSharedMemoryBuffer(output_buffer_size)
- .Pass());
+ RenderThread::Get()->HostAllocateSharedMemoryBuffer(
+ output_buffer_size));
if (!shm || !shm->Map(output_buffer_size)) {
shm_buffers_.clear();
break;
}
- shm_buffers_.push_back(new ShmBuffer(i, shm.Pass()));
+ shm_buffers_.push_back(new ShmBuffer(i, std::move(shm)));
}
// Feed buffers to the encoder.
@@ -570,14 +572,10 @@ void PepperVideoEncoderHost::AllocateVideoFrames() {
uint32_t total_size = size.ValueOrDie();
scoped_ptr<base::SharedMemory> shm(
- RenderThreadImpl::current()
- ->HostAllocateSharedMemoryBuffer(total_size)
- .Pass());
+ RenderThreadImpl::current()->HostAllocateSharedMemoryBuffer(total_size));
if (!shm ||
- !buffer_manager_.SetBuffers(frame_count_,
- buffer_size_aligned,
- shm.Pass(),
- true)) {
+ !buffer_manager_.SetBuffers(frame_count_, buffer_size_aligned,
+ std::move(shm), true)) {
SendGetFramesErrorReply(PP_ERROR_NOMEMORY);
return;
}
diff --git a/content/renderer/pepper/pepper_webplugin_impl.cc b/content/renderer/pepper/pepper_webplugin_impl.cc
index 9a846d0..7c4e04d 100644
--- a/content/renderer/pepper/pepper_webplugin_impl.cc
+++ b/content/renderer/pepper/pepper_webplugin_impl.cc
@@ -5,8 +5,8 @@
#include "content/renderer/pepper/pepper_webplugin_impl.h"
#include <stddef.h>
-
#include <cmath>
+#include <utility>
#include "base/debug/crash_logging.h"
#include "base/message_loop/message_loop.h"
@@ -64,7 +64,7 @@ PepperWebPluginImpl::PepperWebPluginImpl(
scoped_ptr<PluginInstanceThrottlerImpl> throttler)
: init_data_(new InitData()),
full_frame_(params.loadManually),
- throttler_(throttler.Pass()),
+ throttler_(std::move(throttler)),
instance_object_(PP_MakeUndefined()),
container_(NULL),
weak_factory_(this) {
@@ -103,7 +103,7 @@ bool PepperWebPluginImpl::initialize(WebPluginContainer* container) {
auto weak_this = weak_factory_.GetWeakPtr();
bool success =
instance_->Initialize(init_data_->arg_names, init_data_->arg_values,
- full_frame_, throttler_.Pass());
+ full_frame_, std::move(throttler_));
// The above call to Initialize can result in re-entrancy and destruction of
// the plugin instance. In this case it's quite unclear whether this object
// could also have been destroyed. We could return false here, but it would be
diff --git a/content/renderer/pepper/plugin_module.cc b/content/renderer/pepper/plugin_module.cc
index 40fbea0..00f7107f 100644
--- a/content/renderer/pepper/plugin_module.cc
+++ b/content/renderer/pepper/plugin_module.cc
@@ -7,8 +7,8 @@
#include <stddef.h>
#include <stdint.h>
#include <string.h>
-
#include <set>
+#include <utility>
#include "base/bind.h"
#include "base/command_line.h"
@@ -558,7 +558,7 @@ PluginModule::~PluginModule() {
void PluginModule::SetRendererPpapiHost(
scoped_ptr<RendererPpapiHostImpl> host) {
- renderer_ppapi_host_ = host.Pass();
+ renderer_ppapi_host_ = std::move(host);
}
bool PluginModule::InitAsInternalPlugin(
diff --git a/content/renderer/pepper/v8_var_converter_unittest.cc b/content/renderer/pepper/v8_var_converter_unittest.cc
index cb68d6c..cd07abb 100644
--- a/content/renderer/pepper/v8_var_converter_unittest.cc
+++ b/content/renderer/pepper/v8_var_converter_unittest.cc
@@ -171,8 +171,7 @@ class V8VarConverterTest : public testing::Test {
: isolate_(v8::Isolate::GetCurrent()) {
PP_Instance dummy = 1234;
converter_.reset(new V8VarConverter(
- dummy,
- scoped_ptr<ResourceConverter>(new MockResourceConverter).Pass()));
+ dummy, scoped_ptr<ResourceConverter>(new MockResourceConverter)));
}
~V8VarConverterTest() override {}
diff --git a/content/renderer/pepper/video_decoder_shim.cc b/content/renderer/pepper/video_decoder_shim.cc
index 265eb2f..7058534 100644
--- a/content/renderer/pepper/video_decoder_shim.cc
+++ b/content/renderer/pepper/video_decoder_shim.cc
@@ -7,6 +7,7 @@
#include <GLES2/gl2.h>
#include <GLES2/gl2ext.h>
#include <GLES2/gl2extchromium.h>
+#include <utility>
#include "base/bind.h"
#include "base/location.h"
@@ -699,7 +700,7 @@ void VideoDecoderShim::DecoderImpl::Initialize(
scoped_ptr<media::FFmpegVideoDecoder> ffmpeg_video_decoder(
new media::FFmpegVideoDecoder());
ffmpeg_video_decoder->set_decode_nalus(true);
- decoder_ = ffmpeg_video_decoder.Pass();
+ decoder_ = std::move(ffmpeg_video_decoder);
}
#elif defined(MEDIA_DISABLE_LIBVPX)
OnInitDone(false);
diff --git a/content/renderer/presentation/presentation_dispatcher.cc b/content/renderer/presentation/presentation_dispatcher.cc
index db1c94a..33fe33c 100644
--- a/content/renderer/presentation/presentation_dispatcher.cc
+++ b/content/renderer/presentation/presentation_dispatcher.cc
@@ -5,6 +5,7 @@
#include "content/renderer/presentation/presentation_dispatcher.h"
#include <algorithm>
+#include <utility>
#include <vector>
#include "base/logging.h"
@@ -179,7 +180,7 @@ void PresentationDispatcher::DoSendMessage(SendMessageRequest* request) {
ConnectToPresentationServiceIfNeeded();
presentation_service_->SendSessionMessage(
- request->session_info.Pass(), request->message.Pass(),
+ std::move(request->session_info), std::move(request->message),
base::Bind(&PresentationDispatcher::HandleSendMessageRequests,
base::Unretained(this)));
}
@@ -348,7 +349,7 @@ void PresentationDispatcher::OnDefaultSessionStarted(
if (!session_info.is_null()) {
presentation_service_->ListenForSessionMessages(session_info.Clone());
controller_->didStartDefaultSession(
- new PresentationConnectionClient(session_info.Pass()));
+ new PresentationConnectionClient(std::move(session_info)));
}
}
@@ -368,7 +369,7 @@ void PresentationDispatcher::OnSessionCreated(
DCHECK(!session_info.is_null());
presentation_service_->ListenForSessionMessages(session_info.Clone());
callback->onSuccess(blink::adoptWebPtr(
- new PresentationConnectionClient(session_info.Pass())));
+ new PresentationConnectionClient(std::move(session_info))));
}
void PresentationDispatcher::OnConnectionStateChanged(
@@ -379,7 +380,7 @@ void PresentationDispatcher::OnConnectionStateChanged(
DCHECK(!connection.is_null());
controller_->didChangeSessionState(
- new PresentationConnectionClient(connection.Pass()),
+ new PresentationConnectionClient(std::move(connection)),
GetWebPresentationConnectionStateFromMojo(state));
}
@@ -427,7 +428,7 @@ void PresentationDispatcher::ConnectToPresentationServiceIfNeeded() {
mojo::GetProxy(&presentation_service_));
presentation::PresentationServiceClientPtr client_ptr;
binding_.Bind(GetProxy(&client_ptr));
- presentation_service_->SetClient(client_ptr.Pass());
+ presentation_service_->SetClient(std::move(client_ptr));
}
void PresentationDispatcher::UpdateListeningState(AvailabilityStatus* status) {
@@ -451,7 +452,7 @@ void PresentationDispatcher::UpdateListeningState(AvailabilityStatus* status) {
PresentationDispatcher::SendMessageRequest::SendMessageRequest(
presentation::PresentationSessionInfoPtr session_info,
presentation::SessionMessagePtr message)
- : session_info(session_info.Pass()), message(message.Pass()) {}
+ : session_info(std::move(session_info)), message(std::move(message)) {}
PresentationDispatcher::SendMessageRequest::~SendMessageRequest() {}
@@ -471,7 +472,8 @@ PresentationDispatcher::CreateSendTextMessageRequest(
session_message->type =
presentation::PresentationMessageType::PRESENTATION_MESSAGE_TYPE_TEXT;
session_message->message = message.utf8();
- return new SendMessageRequest(session_info.Pass(), session_message.Pass());
+ return new SendMessageRequest(std::move(session_info),
+ std::move(session_message));
}
// static
@@ -492,7 +494,8 @@ PresentationDispatcher::CreateSendBinaryMessageRequest(
session_message->type = type;
std::vector<uint8_t> tmp_data_vector(data, data + length);
session_message->data.Swap(&tmp_data_vector);
- return new SendMessageRequest(session_info.Pass(), session_message.Pass());
+ return new SendMessageRequest(std::move(session_info),
+ std::move(session_message));
}
PresentationDispatcher::AvailabilityStatus::AvailabilityStatus(
diff --git a/content/renderer/raster_worker_pool.cc b/content/renderer/raster_worker_pool.cc
index 20b56ae..b1f5edb 100644
--- a/content/renderer/raster_worker_pool.cc
+++ b/content/renderer/raster_worker_pool.cc
@@ -106,7 +106,7 @@ void RasterWorkerPool::Start(
.c_str(),
thread_options));
thread->Start();
- threads_.push_back(thread.Pass());
+ threads_.push_back(std::move(thread));
}
}
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 30a9f25..180be85 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -6,6 +6,7 @@
#include <map>
#include <string>
+#include <utility>
#include <vector>
#include "base/auto_reset.h"
@@ -476,7 +477,7 @@ WebURLRequest CreateURLRequestForNavigation(
}
RequestExtraData* extra_data = new RequestExtraData();
- extra_data->set_stream_override(stream_override.Pass());
+ extra_data->set_stream_override(std::move(stream_override));
request.setExtraData(extra_data);
// Set the ui timestamp for this navigation. Currently the timestamp here is
@@ -1321,8 +1322,8 @@ void RenderFrameImpl::NavigateToSwappedOutURL() {
void RenderFrameImpl::BindServiceRegistry(
mojo::InterfaceRequest<mojo::ServiceProvider> services,
mojo::ServiceProviderPtr exposed_services) {
- service_registry_.Bind(services.Pass());
- service_registry_.BindRemoteServiceProvider(exposed_services.Pass());
+ service_registry_.Bind(std::move(services));
+ service_registry_.BindRemoteServiceProvider(std::move(exposed_services));
}
ManifestManager* RenderFrameImpl::manifest_manager() {
@@ -1331,7 +1332,7 @@ ManifestManager* RenderFrameImpl::manifest_manager() {
void RenderFrameImpl::SetPendingNavigationParams(
scoped_ptr<NavigationParams> navigation_params) {
- pending_navigation_params_ = navigation_params.Pass();
+ pending_navigation_params_ = std::move(navigation_params);
}
void RenderFrameImpl::OnBeforeUnload() {
@@ -1733,7 +1734,7 @@ void RenderFrameImpl::JavaScriptIsolatedWorldRequest::completed(
for (const auto& value : result) {
scoped_ptr<base::Value> result_value(
converter.FromV8Value(value, context));
- list.Append(result_value ? result_value.Pass()
+ list.Append(result_value ? std::move(result_value)
: base::Value::CreateNullValue());
}
} else {
@@ -1761,7 +1762,7 @@ void RenderFrameImpl::HandleJavascriptExecutionResult(
converter.SetRegExpAllowed(true);
scoped_ptr<base::Value> result_value(
converter.FromV8Value(result, context));
- list.Set(0, result_value ? result_value.Pass()
+ list.Set(0, result_value ? std::move(result_value)
: base::Value::CreateNullValue());
} else {
list.Set(0, base::Value::CreateNullValue());
@@ -2336,7 +2337,7 @@ blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer(
return new media::WebMediaPlayerImpl(
frame, client, encrypted_client, GetWebMediaPlayerDelegate()->AsWeakPtr(),
- media_renderer_factory.Pass(), GetCdmFactory(), url_index_, params);
+ std::move(media_renderer_factory), GetCdmFactory(), url_index_, params);
}
blink::WebMediaSession* RenderFrameImpl::createMediaSession() {
@@ -3639,7 +3640,7 @@ void RenderFrameImpl::willSendRequest(
extra_data->set_transferred_request_request_id(
navigation_state->start_params().transferred_request_request_id);
extra_data->set_service_worker_provider_id(provider_id);
- extra_data->set_stream_override(stream_override.Pass());
+ extra_data->set_stream_override(std::move(stream_override));
if (request.loFiState() != WebURLRequest::LoFiUnspecified)
extra_data->set_lofi_state(static_cast<LoFiState>(request.loFiState()));
else if (is_main_frame_ && !navigation_state->request_committed())
@@ -4485,7 +4486,7 @@ void RenderFrameImpl::OnCommitNavigation(
stream_override->response = response;
NavigateInternal(common_params, StartNavigationParams(), request_params,
- stream_override.Pass());
+ std::move(stream_override));
}
void RenderFrameImpl::OnFailedNavigation(
@@ -4927,8 +4928,9 @@ void RenderFrameImpl::NavigateInternal(
blink::WebFrameLoadType load_type = blink::WebFrameLoadType::Standard;
bool should_load_request = false;
WebHistoryItem item_for_history_navigation;
- WebURLRequest request = CreateURLRequestForNavigation(
- common_params, stream_params.Pass(), frame_->isViewSourceModeEnabled());
+ WebURLRequest request =
+ CreateURLRequestForNavigation(common_params, std::move(stream_params),
+ frame_->isViewSourceModeEnabled());
#if defined(OS_ANDROID)
request.setHasUserGesture(start_params.has_user_gesture);
#endif
@@ -4980,14 +4982,15 @@ void RenderFrameImpl::NavigateInternal(
// process.
DCHECK(!frame_->parent());
render_view_->history_controller()->GoToEntry(
- frame_, entry.Pass(), navigation_params.Pass(), cache_policy);
+ frame_, std::move(entry), std::move(navigation_params),
+ cache_policy);
} else {
// In --site-per-process, the browser process sends a single
// WebHistoryItem destined for this frame.
// TODO(creis): Change PageState to FrameState. In the meantime, we
// store the relevant frame's WebHistoryItem in the root of the
// PageState.
- SetPendingNavigationParams(navigation_params.Pass());
+ SetPendingNavigationParams(std::move(navigation_params));
blink::WebHistoryItem history_item = entry->root();
blink::WebHistoryLoadType load_type =
request_params.is_same_document_history_load
@@ -5141,9 +5144,8 @@ void RenderFrameImpl::InitializeUserMediaClient() {
#if defined(ENABLE_WEBRTC)
DCHECK(!web_user_media_client_);
web_user_media_client_ = new UserMediaClientImpl(
- this,
- RenderThreadImpl::current()->GetPeerConnectionDependencyFactory(),
- make_scoped_ptr(new MediaStreamDispatcher(this)).Pass());
+ this, RenderThreadImpl::current()->GetPeerConnectionDependencyFactory(),
+ make_scoped_ptr(new MediaStreamDispatcher(this)));
#endif
}
@@ -5180,7 +5182,7 @@ RenderFrameImpl::CreateRendererFactory() {
scoped_ptr<MediaStreamRendererFactory> factory =
GetContentClient()->renderer()->CreateMediaStreamRendererFactory();
if (factory.get())
- return factory.Pass();
+ return factory;
#if defined(ENABLE_WEBRTC)
return scoped_ptr<MediaStreamRendererFactory>(
new MediaStreamRendererFactoryImpl());
@@ -5530,7 +5532,7 @@ scoped_ptr<media::MediaPermission> RenderFrameImpl::CreateMediaPermissionProxy(
scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner) {
MediaPermissionDispatcherImpl* media_permission =
static_cast<MediaPermissionDispatcherImpl*>(GetMediaPermission());
- return media_permission->CreateProxy(caller_task_runner).Pass();
+ return media_permission->CreateProxy(caller_task_runner);
}
media::MediaPermission* RenderFrameImpl::GetMediaPermission() {
@@ -5616,11 +5618,11 @@ mojo::ServiceProviderPtr RenderFrameImpl::ConnectToApplication(
mojo::CapabilityFilterPtr filter(mojo::CapabilityFilter::New());
mojo::Array<mojo::String> all_interfaces;
all_interfaces.push_back("*");
- filter->filter.insert("*", all_interfaces.Pass());
- mojo_shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider),
- nullptr, filter.Pass(),
- base::Bind(&OnGotContentHandlerID));
- return service_provider.Pass();
+ filter->filter.insert("*", std::move(all_interfaces));
+ mojo_shell_->ConnectToApplication(
+ std::move(request), GetProxy(&service_provider), nullptr,
+ std::move(filter), base::Bind(&OnGotContentHandlerID));
+ return service_provider;
}
media::RendererWebMediaPlayerDelegate*
diff --git a/content/renderer/render_frame_proxy.cc b/content/renderer/render_frame_proxy.cc
index 3e17627..e67a052 100644
--- a/content/renderer/render_frame_proxy.cc
+++ b/content/renderer/render_frame_proxy.cc
@@ -5,8 +5,8 @@
#include "content/renderer/render_frame_proxy.h"
#include <stdint.h>
-
#include <map>
+#include <utility>
#include "base/command_line.h"
#include "base/lazy_instance.h"
@@ -279,8 +279,7 @@ void RenderFrameProxy::OnCompositorFrameSwapped(const IPC::Message& message) {
ChildFrameCompositingHelper::CreateForRenderFrameProxy(this);
}
compositing_helper_->OnCompositorFrameSwapped(
- frame.Pass(),
- base::get<0>(param).producing_route_id,
+ std::move(frame), base::get<0>(param).producing_route_id,
base::get<0>(param).output_surface_id,
base::get<0>(param).producing_host_id,
base::get<0>(param).shared_memory_handle);
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 83c6420..97c2e0d 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -7,6 +7,7 @@
#include <algorithm>
#include <limits>
#include <map>
+#include <utility>
#include <vector>
#include "base/allocator/allocator_extension.h"
@@ -348,7 +349,7 @@ class RenderFrameSetupImpl : public RenderFrameSetup {
public:
explicit RenderFrameSetupImpl(
mojo::InterfaceRequest<RenderFrameSetup> request)
- : routing_id_highmark_(-1), binding_(this, request.Pass()) {}
+ : routing_id_highmark_(-1), binding_(this, std::move(request)) {}
void ExchangeServiceProviders(
int32_t frame_routing_id,
@@ -366,11 +367,12 @@ class RenderFrameSetupImpl : public RenderFrameSetup {
// triggers creation of the RenderFrame we want.
if (!frame) {
RenderThreadImpl::current()->RegisterPendingRenderFrameConnect(
- frame_routing_id, services.Pass(), exposed_services.Pass());
+ frame_routing_id, std::move(services), std::move(exposed_services));
return;
}
- frame->BindServiceRegistry(services.Pass(), exposed_services.Pass());
+ frame->BindServiceRegistry(std::move(services),
+ std::move(exposed_services));
}
private:
@@ -379,7 +381,7 @@ class RenderFrameSetupImpl : public RenderFrameSetup {
};
void CreateRenderFrameSetup(mojo::InterfaceRequest<RenderFrameSetup> request) {
- new RenderFrameSetupImpl(request.Pass());
+ new RenderFrameSetupImpl(std::move(request));
}
blink::WebGraphicsContext3D::Attributes GetOffscreenAttribs() {
@@ -402,15 +404,15 @@ void SetupEmbeddedWorkerOnWorkerThread(
// nothing and let mojo close the connection.
if (!client)
return;
- client->BindServiceRegistry(services.Pass(),
- mojo::MakeProxy(exposed_services.Pass()));
+ client->BindServiceRegistry(std::move(services),
+ mojo::MakeProxy(std::move(exposed_services)));
}
class EmbeddedWorkerSetupImpl : public EmbeddedWorkerSetup {
public:
explicit EmbeddedWorkerSetupImpl(
mojo::InterfaceRequest<EmbeddedWorkerSetup> request)
- : binding_(this, request.Pass()) {}
+ : binding_(this, std::move(request)) {}
void ExchangeServiceProviders(
int32_t thread_id,
@@ -428,7 +430,7 @@ class EmbeddedWorkerSetupImpl : public EmbeddedWorkerSetup {
void CreateEmbeddedWorkerSetup(
mojo::InterfaceRequest<EmbeddedWorkerSetup> request) {
- new EmbeddedWorkerSetupImpl(request.Pass());
+ new EmbeddedWorkerSetupImpl(std::move(request));
}
void StringToUintVector(const std::string& str, std::vector<unsigned>* vector) {
@@ -568,15 +570,15 @@ RenderThreadImpl* RenderThreadImpl::Create(
const InProcessChildThreadParams& params) {
scoped_ptr<scheduler::RendererScheduler> renderer_scheduler =
scheduler::RendererScheduler::Create();
- return new RenderThreadImpl(params, renderer_scheduler.Pass());
+ return new RenderThreadImpl(params, std::move(renderer_scheduler));
}
// static
RenderThreadImpl* RenderThreadImpl::Create(
scoped_ptr<base::MessageLoop> main_message_loop,
scoped_ptr<scheduler::RendererScheduler> renderer_scheduler) {
- return new RenderThreadImpl(main_message_loop.Pass(),
- renderer_scheduler.Pass());
+ return new RenderThreadImpl(std::move(main_message_loop),
+ std::move(renderer_scheduler));
}
RenderThreadImpl* RenderThreadImpl::current() {
@@ -590,7 +592,7 @@ RenderThreadImpl::RenderThreadImpl(
.InBrowserProcess(params)
.UseMojoChannel(ShouldUseMojoChannel())
.Build()),
- renderer_scheduler_(scheduler.Pass()),
+ renderer_scheduler_(std::move(scheduler)),
raster_worker_pool_(new RasterWorkerPool()) {
Init();
}
@@ -603,8 +605,8 @@ RenderThreadImpl::RenderThreadImpl(
: ChildThreadImpl(Options::Builder()
.UseMojoChannel(ShouldUseMojoChannel())
.Build()),
- renderer_scheduler_(scheduler.Pass()),
- main_message_loop_(main_message_loop.Pass()),
+ renderer_scheduler_(std::move(scheduler)),
+ main_message_loop_(std::move(main_message_loop)),
raster_worker_pool_(new RasterWorkerPool()) {
Init();
}
@@ -1049,13 +1051,13 @@ void RenderThreadImpl::AddRoute(int32_t routing_id, IPC::Listener* listener) {
scoped_refptr<PendingRenderFrameConnect> connection(it->second);
mojo::InterfaceRequest<mojo::ServiceProvider> services(
- connection->services().Pass());
+ std::move(connection->services()));
mojo::ServiceProviderPtr exposed_services(
- connection->exposed_services().Pass());
+ std::move(connection->exposed_services()));
exposed_services.set_connection_error_handler(mojo::Closure());
pending_render_frame_connects_.erase(it);
- frame->BindServiceRegistry(services.Pass(), exposed_services.Pass());
+ frame->BindServiceRegistry(std::move(services), std::move(exposed_services));
}
void RenderThreadImpl::RemoveRoute(int32_t routing_id) {
@@ -1087,7 +1089,7 @@ void RenderThreadImpl::RegisterPendingRenderFrameConnect(
pending_render_frame_connects_.insert(std::make_pair(
routing_id,
make_scoped_refptr(new PendingRenderFrameConnect(
- routing_id, services.Pass(), exposed_services.Pass()))));
+ routing_id, std::move(services), std::move(exposed_services)))));
CHECK(result.second) << "Inserting a duplicate item.";
}
@@ -2079,8 +2081,8 @@ RenderThreadImpl::PendingRenderFrameConnect::PendingRenderFrameConnect(
mojo::InterfaceRequest<mojo::ServiceProvider> services,
mojo::ServiceProviderPtr exposed_services)
: routing_id_(routing_id),
- services_(services.Pass()),
- exposed_services_(exposed_services.Pass()) {
+ services_(std::move(services)),
+ exposed_services_(std::move(exposed_services)) {
// The RenderFrame may be deleted before the ExchangeServiceProviders message
// is received. In that case, the RenderFrameHost should close the connection,
// which is detected by setting an error handler on |exposed_services_|.
diff --git a/content/renderer/render_thread_impl_browsertest.cc b/content/renderer/render_thread_impl_browsertest.cc
index b926299..95556d8 100644
--- a/content/renderer/render_thread_impl_browsertest.cc
+++ b/content/renderer/render_thread_impl_browsertest.cc
@@ -2,8 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "content/renderer/render_thread_impl.h"
+
#include <stddef.h>
#include <stdint.h>
+#include <utility>
#include "base/callback.h"
#include "base/command_line.h"
@@ -22,7 +25,6 @@
#include "content/public/common/content_switches.h"
#include "content/public/renderer/content_renderer_client.h"
#include "content/renderer/render_process_impl.h"
-#include "content/renderer/render_thread_impl.h"
#include "content/test/mock_render_process.h"
#include "content/test/render_thread_impl_browser_test_ipc_helper.h"
#include "gpu/GLES2/gl2extchromium.h"
@@ -97,7 +99,7 @@ class RenderThreadImplForTest : public RenderThreadImpl {
RenderThreadImplForTest(const InProcessChildThreadParams& params,
scoped_ptr<scheduler::RendererScheduler> scheduler,
scoped_refptr<TestTaskCounter> test_task_counter)
- : RenderThreadImpl(params, scheduler.Pass()),
+ : RenderThreadImpl(params, std::move(scheduler)),
test_task_counter_(test_task_counter) {}
~RenderThreadImplForTest() override {}
@@ -181,7 +183,7 @@ class RenderThreadImplBrowserTest : public testing::Test {
thread_ = new RenderThreadImplForTest(
InProcessChildThreadParams(test_helper_->GetChannelId(),
test_helper_->GetIOTaskRunner()),
- renderer_scheduler.Pass(), test_task_counter_);
+ std::move(renderer_scheduler), test_task_counter_);
cmd->InitFromArgv(old_argv);
thread_->EnsureWebKitInitialized();
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index efdeb26..78c982d 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -1570,7 +1570,7 @@ void RenderViewImpl::OnForceRedraw(int id) {
scoped_ptr<cc::SwapPromiseMonitor> latency_info_swap_promise_monitor;
if (RenderWidgetCompositor* rwc = compositor()) {
latency_info_swap_promise_monitor =
- rwc->CreateLatencyInfoSwapPromiseMonitor(&latency_info).Pass();
+ rwc->CreateLatencyInfoSwapPromiseMonitor(&latency_info);
}
ScheduleCompositeWithForcedRedraw();
}
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index 405b64e..8366d6c 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -4,6 +4,8 @@
#include "content/renderer/render_widget.h"
+#include <utility>
+
#include "base/auto_reset.h"
#include "base/bind.h"
#include "base/command_line.h"
@@ -469,8 +471,7 @@ RenderWidget::RenderWidget(CompositorDependencies* compositor_deps,
if (RenderThreadImpl::current()) {
render_widget_scheduling_state_ = RenderThreadImpl::current()
->GetRendererScheduler()
- ->NewRenderWidgetSchedulingState()
- .Pass();
+ ->NewRenderWidgetSchedulingState();
render_widget_scheduling_state_->SetHidden(is_hidden_);
}
}
@@ -1000,7 +1001,7 @@ scoped_ptr<cc::OutputSurface> RenderWidget::CreateOutputSurface(bool fallback) {
return make_scoped_ptr(new CompositorOutputSurface(
routing_id(), output_surface_id, nullptr, nullptr,
- software_device.Pass(), frame_swap_message_queue_, true));
+ std::move(software_device), frame_swap_message_queue_, true));
}
return make_scoped_ptr(new MailboxOutputSurface(
@@ -1338,7 +1339,7 @@ void RenderWidget::QueueMessage(IPC::Message* msg,
compositor_->GetSourceFrameNumber());
if (swap_promise) {
- compositor_->QueueSwapPromise(swap_promise.Pass());
+ compositor_->QueueSwapPromise(std::move(swap_promise));
// Request a commit. This might either A) request a commit ahead of time
// or B) request a commit which is not needed because there are not
// pending updates. If B) then the commit will be skipped and the swap
@@ -1425,7 +1426,7 @@ void RenderWidget::QueueSyntheticGesture(
pending_synthetic_gesture_callbacks_.push(callback);
SyntheticGesturePacket gesture_packet;
- gesture_packet.set_gesture_params(gesture_params.Pass());
+ gesture_packet.set_gesture_params(std::move(gesture_params));
Send(new InputHostMsg_QueueSyntheticGesture(routing_id_, gesture_packet));
}
@@ -2136,7 +2137,7 @@ RenderWidget::CreateGraphicsContext3D(bool compositor) {
new WebGraphicsContext3DCommandBufferImpl(
0, GetURLForGraphicsContext3D(), gpu_channel_host.get(), attributes,
lose_context_when_out_of_memory, limits, NULL));
- return context.Pass();
+ return context;
}
void RenderWidget::RegisterRenderFrameProxy(RenderFrameProxy* proxy) {
diff --git a/content/renderer/render_widget_browsertest.cc b/content/renderer/render_widget_browsertest.cc
index be0fe4e..e3caf1f 100644
--- a/content/renderer/render_widget_browsertest.cc
+++ b/content/renderer/render_widget_browsertest.cc
@@ -74,7 +74,7 @@ class RenderWidgetInitialSizeTest : public RenderWidgetTest {
initial_size_params->new_size = initial_size_;
initial_size_params->physical_backing_size = initial_size_;
initial_size_params->needs_resize_ack = true;
- return initial_size_params.Pass();
+ return initial_size_params;
}
gfx::Size initial_size_;
diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
index 80a8135..391a2a4 100644
--- a/content/renderer/renderer_blink_platform_impl.cc
+++ b/content/renderer/renderer_blink_platform_impl.cc
@@ -4,6 +4,8 @@
#include "content/renderer/renderer_blink_platform_impl.h"
+#include <utility>
+
#include "base/command_line.h"
#include "base/files/file_path.h"
#include "base/lazy_instance.h"
@@ -301,7 +303,7 @@ blink::WebURLLoader* RendererBlinkPlatformImpl::createURLLoader() {
? loading_task_runner_ : base::ThreadTaskRunnerHandle::Get()));
return new content::WebURLLoaderImpl(
child_thread ? child_thread->resource_dispatcher() : NULL,
- task_runner.Pass());
+ std::move(task_runner));
}
blink::WebThread* RendererBlinkPlatformImpl::currentThread() {
diff --git a/content/renderer/renderer_main.cc b/content/renderer/renderer_main.cc
index c7ac7f0..1847018 100644
--- a/content/renderer/renderer_main.cc
+++ b/content/renderer/renderer_main.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include <stddef.h>
+#include <utility>
#include "base/base_switches.h"
#include "base/command_line.h"
@@ -183,7 +184,7 @@ int RendererMain(const MainFunctionParams& parameters) {
feature_list->InitializeFromCommandLine(
parsed_command_line.GetSwitchValueASCII(switches::kEnableFeatures),
parsed_command_line.GetSwitchValueASCII(switches::kDisableFeatures));
- base::FeatureList::SetInstance(feature_list.Pass());
+ base::FeatureList::SetInstance(std::move(feature_list));
// PlatformInitialize uses FieldTrials, so this must happen later.
platform.PlatformInitialize();
@@ -213,8 +214,8 @@ int RendererMain(const MainFunctionParams& parameters) {
run_loop = platform.EnableSandbox();
#if defined(OS_POSIX) && !defined(OS_MACOSX)
RenderProcessImpl render_process;
- RenderThreadImpl::Create(main_message_loop.Pass(),
- renderer_scheduler.Pass());
+ RenderThreadImpl::Create(std::move(main_message_loop),
+ std::move(renderer_scheduler));
#endif
RenderThreadImpl::current()->Send(
new StartupMetricHostMsg_RecordRendererMainEntryTime(
diff --git a/content/renderer/service_worker/service_worker_context_client.cc b/content/renderer/service_worker/service_worker_context_client.cc
index a370f6d..7b0bd89 100644
--- a/content/renderer/service_worker/service_worker_context_client.cc
+++ b/content/renderer/service_worker/service_worker_context_client.cc
@@ -4,6 +4,8 @@
#include "content/renderer/service_worker/service_worker_context_client.h"
+#include <utility>
+
#include "base/lazy_instance.h"
#include "base/logging.h"
#include "base/metrics/histogram.h"
@@ -106,7 +108,7 @@ void SendPostMessageToClientOnMainThread(
scoped_ptr<blink::WebMessagePortChannelArray> channels) {
sender->Send(new ServiceWorkerHostMsg_PostMessageToClient(
routing_id, uuid, message,
- WebMessagePortChannelImpl::ExtractMessagePortIDs(channels.Pass())));
+ WebMessagePortChannelImpl::ExtractMessagePortIDs(std::move(channels))));
}
void SendCrossOriginMessageToClientOnMainThread(
@@ -116,7 +118,7 @@ void SendCrossOriginMessageToClientOnMainThread(
scoped_ptr<blink::WebMessagePortChannelArray> channels) {
sender->Send(new MessagePortHostMsg_PostMessage(
message_port_id, MessagePortMessage(message),
- WebMessagePortChannelImpl::ExtractMessagePortIDs(channels.Pass())));
+ WebMessagePortChannelImpl::ExtractMessagePortIDs(std::move(channels))));
}
blink::WebURLRequest::FetchRequestMode GetBlinkFetchRequestMode(
@@ -279,8 +281,9 @@ void ServiceWorkerContextClient::OnMessageReceived(
void ServiceWorkerContextClient::BindServiceRegistry(
mojo::InterfaceRequest<mojo::ServiceProvider> services,
mojo::ServiceProviderPtr exposed_services) {
- context_->service_registry.Bind(services.Pass());
- context_->service_registry.BindRemoteServiceProvider(exposed_services.Pass());
+ context_->service_registry.Bind(std::move(services));
+ context_->service_registry.BindRemoteServiceProvider(
+ std::move(exposed_services));
}
blink::WebURL ServiceWorkerContextClient::scope() const {
@@ -562,8 +565,8 @@ ServiceWorkerContextClient::createServiceWorkerNetworkProvider(
// and ownership is transferred to the DataSource.
DataSourceExtraData* extra_data = new DataSourceExtraData();
data_source->setExtraData(extra_data);
- ServiceWorkerNetworkProvider::AttachToDocumentState(
- extra_data, provider.Pass());
+ ServiceWorkerNetworkProvider::AttachToDocumentState(extra_data,
+ std::move(provider));
// Blink is responsible for deleting the returned object.
return new WebServiceWorkerNetworkProviderImpl();
diff --git a/content/renderer/service_worker/service_worker_type_util.cc b/content/renderer/service_worker/service_worker_type_util.cc
index 9e5878f..07c0e6b 100644
--- a/content/renderer/service_worker/service_worker_type_util.cc
+++ b/content/renderer/service_worker/service_worker_type_util.cc
@@ -39,7 +39,7 @@ class HeaderVisitor : public blink::WebHTTPHeaderVisitor {
};
scoped_ptr<HeaderVisitor> MakeHeaderVisitor(ServiceWorkerHeaderMap* headers) {
- return scoped_ptr<HeaderVisitor>(new HeaderVisitor(headers)).Pass();
+ return scoped_ptr<HeaderVisitor>(new HeaderVisitor(headers));
}
} // namespace
diff --git a/content/renderer/shared_worker/embedded_shared_worker_stub.cc b/content/renderer/shared_worker/embedded_shared_worker_stub.cc
index 0eba440..39b0d35 100644
--- a/content/renderer/shared_worker/embedded_shared_worker_stub.cc
+++ b/content/renderer/shared_worker/embedded_shared_worker_stub.cc
@@ -5,6 +5,7 @@
#include "content/renderer/shared_worker/embedded_shared_worker_stub.h"
#include <stdint.h>
+#include <utility>
#include "base/thread_task_runner_handle.h"
#include "content/child/appcache/appcache_dispatcher.h"
@@ -247,8 +248,8 @@ EmbeddedSharedWorkerStub::createServiceWorkerNetworkProvider(
// and ownership is transferred to the DataSource.
DataSourceExtraData* extra_data = new DataSourceExtraData();
data_source->setExtraData(extra_data);
- ServiceWorkerNetworkProvider::AttachToDocumentState(
- extra_data, provider.Pass());
+ ServiceWorkerNetworkProvider::AttachToDocumentState(extra_data,
+ std::move(provider));
// Blink is responsible for deleting the returned object.
return new WebServiceWorkerNetworkProviderImpl();
diff --git a/content/renderer/speech_recognition_dispatcher.cc b/content/renderer/speech_recognition_dispatcher.cc
index 1b6500b..9c20752 100644
--- a/content/renderer/speech_recognition_dispatcher.cc
+++ b/content/renderer/speech_recognition_dispatcher.cc
@@ -6,6 +6,7 @@
#include <stddef.h>
#include <stdint.h>
+#include <utility>
#include "base/strings/utf_string_conversions.h"
#include "content/common/speech_recognition_messages.h"
@@ -275,7 +276,7 @@ void SpeechRecognitionDispatcher::OnAudioReceiverReady(
base::SyncSocket::UnwrapHandle(descriptor)));
speech_audio_sink_.reset(new SpeechRecognitionAudioSink(
- audio_track_, params, memory, socket.Pass(),
+ audio_track_, params, memory, std::move(socket),
base::Bind(&SpeechRecognitionDispatcher::ResetAudioSink,
base::Unretained(this))));
#endif
diff --git a/content/renderer/usb/type_converters.cc b/content/renderer/usb/type_converters.cc
index 19b76e5..62c9aab 100644
--- a/content/renderer/usb/type_converters.cc
+++ b/content/renderer/usb/type_converters.cc
@@ -94,7 +94,7 @@ TypeConverter<device::usb::ControlTransferParamsPtr,
params->request = parameters.request;
params->value = parameters.value;
params->index = parameters.index;
- return params.Pass();
+ return params;
}
// static
@@ -239,7 +239,7 @@ TypeConverter<device::usb::DeviceFilterPtr, blink::WebUSBDeviceFilter>::Convert(
filter->subclass_code = web_filter.subclassCode;
filter->has_protocol_code = web_filter.hasProtocolCode;
filter->protocol_code = web_filter.protocolCode;
- return filter.Pass();
+ return filter;
}
// static
@@ -255,7 +255,7 @@ TypeConverter<device::usb::EnumerationOptionsPtr,
options->filters[i] =
device::usb::DeviceFilter::From(web_options.filters[i]);
}
- return options.Pass();
+ return options;
}
} // namespace mojo
diff --git a/content/renderer/usb/web_usb_client_impl.cc b/content/renderer/usb/web_usb_client_impl.cc
index 530b64a..ed9246a 100644
--- a/content/renderer/usb/web_usb_client_impl.cc
+++ b/content/renderer/usb/web_usb_client_impl.cc
@@ -5,6 +5,7 @@
#include "content/renderer/usb/web_usb_client_impl.h"
#include <stddef.h>
+#include <utility>
#include "base/bind.h"
#include "base/callback.h"
@@ -62,7 +63,8 @@ void OnGetDevicesComplete(
device::usb::DevicePtr device;
device_manager->GetDevice(results[i]->guid, mojo::GetProxy(&device));
(*devices)[i] = new WebUSBDeviceImpl(
- device.Pass(), mojo::ConvertTo<blink::WebUSBDeviceInfo>(results[i]));
+ std::move(device),
+ mojo::ConvertTo<blink::WebUSBDeviceInfo>(results[i]));
}
scoped_callbacks.PassCallbacks()->onSuccess(blink::adoptWebPtr(devices));
}
@@ -76,7 +78,7 @@ void OnRequestDevicesComplete(
device::usb::DevicePtr device;
device_manager->GetDevice(result->guid, mojo::GetProxy(&device));
blink::WebUSBDevice* web_usb_device = new WebUSBDeviceImpl(
- device.Pass(), mojo::ConvertTo<blink::WebUSBDeviceInfo>(result));
+ std::move(device), mojo::ConvertTo<blink::WebUSBDeviceInfo>(result));
scoped_callbacks->onSuccess(blink::adoptWebPtr(web_usb_device));
} else {
@@ -116,7 +118,7 @@ void WebUSBClientImpl::requestDevice(
mojo::Array<device::usb::DeviceFilterPtr>::From(options.filters);
webusb_permission_bubble_->GetPermission(
- device_filters.Pass(),
+ std::move(device_filters),
base::Bind(&OnRequestDevicesComplete, base::Passed(&scoped_callbacks),
base::Unretained(device_manager_.get())));
}
@@ -153,7 +155,8 @@ void WebUSBClientImpl::OnDeviceChangeNotification(
device::usb::DevicePtr device;
device_manager_->GetDevice(device_info->guid, mojo::GetProxy(&device));
observer_->onDeviceConnected(blink::adoptWebPtr(new WebUSBDeviceImpl(
- device.Pass(), mojo::ConvertTo<blink::WebUSBDeviceInfo>(device_info))));
+ std::move(device),
+ mojo::ConvertTo<blink::WebUSBDeviceInfo>(device_info))));
}
for (size_t i = 0; i < notification->devices_removed.size(); ++i) {
const device::usb::DeviceInfoPtr& device_info =
@@ -161,7 +164,8 @@ void WebUSBClientImpl::OnDeviceChangeNotification(
device::usb::DevicePtr device;
device_manager_->GetDevice(device_info->guid, mojo::GetProxy(&device));
observer_->onDeviceDisconnected(blink::adoptWebPtr(new WebUSBDeviceImpl(
- device.Pass(), mojo::ConvertTo<blink::WebUSBDeviceInfo>(device_info))));
+ std::move(device),
+ mojo::ConvertTo<blink::WebUSBDeviceInfo>(device_info))));
}
}
diff --git a/content/renderer/usb/web_usb_device_impl.cc b/content/renderer/usb/web_usb_device_impl.cc
index 0b6ccb9..ab812fd 100644
--- a/content/renderer/usb/web_usb_device_impl.cc
+++ b/content/renderer/usb/web_usb_device_impl.cc
@@ -4,6 +4,8 @@
#include "content/renderer/usb/web_usb_device_impl.h"
+#include <utility>
+
#include "base/bind.h"
#include "base/callback.h"
#include "base/strings/utf_string_conversions.h"
@@ -44,7 +46,7 @@ template <typename CallbacksType>
void RejectWithTransferError(scoped_ptr<CallbacksType> callbacks) {
RejectWithError(blink::WebUSBError(blink::WebUSBError::Error::Network,
base::ASCIIToUTF16(kTransferFailed)),
- callbacks.Pass());
+ std::move(callbacks));
}
// Create a new ScopedWebCallbacks for WebUSB device callbacks, defaulting to
@@ -89,7 +91,7 @@ void OnGetConfiguration(
if (configuration_value == 0) {
RejectWithError(blink::WebUSBError(blink::WebUSBError::Error::NotFound,
kDeviceNotConfigured),
- scoped_callbacks.Pass());
+ std::move(scoped_callbacks));
} else {
scoped_callbacks->onSuccess(configuration_value);
}
@@ -106,7 +108,7 @@ void HandlePassFailDeviceOperation(
} else {
RejectWithError(blink::WebUSBError(blink::WebUSBError::Error::Network,
base::ASCIIToUTF16(failure_message)),
- scoped_callbacks.Pass());
+ std::move(scoped_callbacks));
}
}
@@ -116,7 +118,7 @@ void OnTransferIn(
mojo::Array<uint8_t> data) {
auto scoped_callbacks = callbacks.PassCallbacks();
if (status != device::usb::TRANSFER_STATUS_COMPLETED) {
- RejectWithTransferError(scoped_callbacks.Pass());
+ RejectWithTransferError(std::move(scoped_callbacks));
return;
}
scoped_ptr<blink::WebUSBTransferInfo> info(new blink::WebUSBTransferInfo());
@@ -142,7 +144,7 @@ void OnTransferOut(
info->status = blink::WebUSBTransferInfo::Status::Babble;
break;
default:
- RejectWithTransferError(scoped_callbacks.Pass());
+ RejectWithTransferError(std::move(scoped_callbacks));
return;
}
@@ -156,7 +158,9 @@ void OnTransferOut(
WebUSBDeviceImpl::WebUSBDeviceImpl(device::usb::DevicePtr device,
const blink::WebUSBDeviceInfo& device_info)
- : device_(device.Pass()), device_info_(device_info), weak_factory_(this) {}
+ : device_(std::move(device)),
+ device_info_(device_info),
+ weak_factory_(this) {}
WebUSBDeviceImpl::~WebUSBDeviceImpl() {}
@@ -244,7 +248,7 @@ void WebUSBDeviceImpl::controlTransfer(
switch (parameters.direction) {
case WebUSBDevice::TransferDirection::In:
device_->ControlTransferIn(
- params.Pass(), data_size, timeout,
+ std::move(params), data_size, timeout,
base::Bind(&OnTransferIn, base::Passed(&scoped_callbacks)));
break;
case WebUSBDevice::TransferDirection::Out: {
@@ -254,7 +258,7 @@ void WebUSBDeviceImpl::controlTransfer(
mojo::Array<uint8_t> mojo_bytes;
mojo_bytes.Swap(&bytes);
device_->ControlTransferOut(
- params.Pass(), mojo_bytes.Pass(), timeout,
+ std::move(params), std::move(mojo_bytes), timeout,
base::Bind(&OnTransferOut, base::Passed(&scoped_callbacks),
data_size));
break;
@@ -285,7 +289,7 @@ void WebUSBDeviceImpl::transfer(
mojo::Array<uint8_t> mojo_bytes;
mojo_bytes.Swap(&bytes);
device_->GenericTransferOut(
- endpoint_number, mojo_bytes.Pass(), timeout,
+ endpoint_number, std::move(mojo_bytes), timeout,
base::Bind(&OnTransferOut, base::Passed(&scoped_callbacks),
data_size));
break;