diff options
| author | dcheng <dcheng@chromium.org> | 2015-12-26 14:45:17 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-26 22:46:08 +0000 |
| commit | 51ace48ad51bae53cef3d63a27fbabeb7d0ecafa (patch) | |
| tree | 75688ca279a49d844a7f7b08026836c7e352ccfd /components/webdata/common | |
| parent | 4a9d9829bc889e6a2cc02dbc443d3032e1d2c81f (diff) | |
| download | chromium_src-51ace48ad51bae53cef3d63a27fbabeb7d0ecafa.zip chromium_src-51ace48ad51bae53cef3d63a27fbabeb7d0ecafa.tar.gz chromium_src-51ace48ad51bae53cef3d63a27fbabeb7d0ecafa.tar.bz2 | |
Convert Pass()→std::move() in //components/[n-z]*
BUG=557422
R=avi@chromium.org
TBR=jochen@chromium.org
Review URL: https://codereview.chromium.org/1548203002
Cr-Commit-Position: refs/heads/master@{#366914}
Diffstat (limited to 'components/webdata/common')
| -rw-r--r-- | components/webdata/common/web_data_request_manager.cc | 6 | ||||
| -rw-r--r-- | components/webdata/common/web_database_backend.cc | 8 | ||||
| -rw-r--r-- | components/webdata/common/web_database_service.cc | 3 |
3 files changed, 11 insertions, 6 deletions
diff --git a/components/webdata/common/web_data_request_manager.cc b/components/webdata/common/web_data_request_manager.cc index 701f8f6..dcaa320 100644 --- a/components/webdata/common/web_data_request_manager.cc +++ b/components/webdata/common/web_data_request_manager.cc @@ -4,6 +4,8 @@ #include "components/webdata/common/web_data_request_manager.h" +#include <utility> + #include "base/bind.h" #include "base/location.h" #include "base/message_loop/message_loop.h" @@ -63,11 +65,11 @@ void WebDataRequest::OnComplete() { } void WebDataRequest::SetResult(scoped_ptr<WDTypedResult> r) { - result_ = r.Pass(); + result_ = std::move(r); } scoped_ptr<WDTypedResult> WebDataRequest::GetResult(){ - return result_.Pass(); + return std::move(result_); } //////////////////////////////////////////////////////////////////////////////// diff --git a/components/webdata/common/web_database_backend.cc b/components/webdata/common/web_database_backend.cc index 2ed1d87..df09d30 100644 --- a/components/webdata/common/web_database_backend.cc +++ b/components/webdata/common/web_database_backend.cc @@ -4,6 +4,8 @@ #include "components/webdata/common/web_database_backend.h" +#include <utility> + #include "base/bind.h" #include "base/location.h" #include "components/webdata/common/web_data_request_manager.h" @@ -75,7 +77,7 @@ void WebDatabaseBackend::DBWriteTaskWrapper( return; ExecuteWriteTask(task); - request_manager_->RequestCompleted(request.Pass()); + request_manager_->RequestCompleted(std::move(request)); } void WebDatabaseBackend::ExecuteWriteTask( @@ -94,8 +96,8 @@ void WebDatabaseBackend::DBReadTaskWrapper( if (request->IsCancelled()) return; - request->SetResult(ExecuteReadTask(task).Pass()); - request_manager_->RequestCompleted(request.Pass()); + request->SetResult(ExecuteReadTask(task)); + request_manager_->RequestCompleted(std::move(request)); } scoped_ptr<WDTypedResult> WebDatabaseBackend::ExecuteReadTask( diff --git a/components/webdata/common/web_database_service.cc b/components/webdata/common/web_database_service.cc index 6fcc9f0..93b0924 100644 --- a/components/webdata/common/web_database_service.cc +++ b/components/webdata/common/web_database_service.cc @@ -5,6 +5,7 @@ #include "components/webdata/common/web_database_service.h" #include <stddef.h> +#include <utility> #include "base/bind.h" #include "base/location.h" @@ -61,7 +62,7 @@ void WebDatabaseService::AddTable(scoped_ptr<WebDatabaseTable> table) { web_db_backend_ = new WebDatabaseBackend( path_, new BackendDelegate(weak_ptr_factory_.GetWeakPtr()), db_thread_); } - web_db_backend_->AddTable(table.Pass()); + web_db_backend_->AddTable(std::move(table)); } void WebDatabaseService::LoadDatabase() { |