diff options
author | dcheng <dcheng@chromium.org> | 2015-12-26 13:16:23 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-12-26 21:17:11 +0000 |
commit | 51606358c63e4005e53c8894463029b57d16751c (patch) | |
tree | 9097a0481effe003a1f5d7df7ba66f21b10c3d4e /components/html_viewer/stats_collection_controller.cc | |
parent | f63a125013805bf3dd72f90ec33f4d0aa0606660 (diff) | |
download | chromium_src-51606358c63e4005e53c8894463029b57d16751c.zip chromium_src-51606358c63e4005e53c8894463029b57d16751c.tar.gz chromium_src-51606358c63e4005e53c8894463029b57d16751c.tar.bz2 |
Convert Pass()→std::move() in //components/[a-m]*
BUG=557422
R=avi@chromium.org
TBR=jochen@chromium.org
Review URL: https://codereview.chromium.org/1548193002
Cr-Commit-Position: refs/heads/master@{#366906}
Diffstat (limited to 'components/html_viewer/stats_collection_controller.cc')
-rw-r--r-- | components/html_viewer/stats_collection_controller.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/components/html_viewer/stats_collection_controller.cc b/components/html_viewer/stats_collection_controller.cc index 24cdd39..9205027 100644 --- a/components/html_viewer/stats_collection_controller.cc +++ b/components/html_viewer/stats_collection_controller.cc @@ -4,6 +4,8 @@ #include "components/html_viewer/stats_collection_controller.h" +#include <utility> + #include "base/command_line.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram.h" @@ -89,12 +91,13 @@ tracing::StartupPerformanceDataCollectorPtr StatsCollectionController::Install( connection->ConnectToService(&collector_for_caller); gin::Handle<StatsCollectionController> controller = gin::CreateHandle( - isolate, new StatsCollectionController(collector_for_controller.Pass())); + isolate, + new StatsCollectionController(std::move(collector_for_controller))); DCHECK(!controller.IsEmpty()); v8::Local<v8::Object> global = context->Global(); global->Set(gin::StringToV8(isolate, "statsCollectionController"), controller.ToV8()); - return collector_for_caller.Pass(); + return collector_for_caller; } // static @@ -109,12 +112,12 @@ StatsCollectionController::ConnectToDataCollector(mojo::ApplicationImpl* app) { tracing::StartupPerformanceDataCollectorPtr collector; app->ConnectToService("mojo:tracing", &collector); - return collector.Pass(); + return collector; } StatsCollectionController::StatsCollectionController( tracing::StartupPerformanceDataCollectorPtr collector) - : startup_performance_data_collector_(collector.Pass()) {} + : startup_performance_data_collector_(std::move(collector)) {} StatsCollectionController::~StatsCollectionController() {} |