Index: third_party/libaddressinput/chromium/chrome_metadata_source.cc |
diff --git a/third_party/libaddressinput/chromium/chrome_metadata_source.cc b/third_party/libaddressinput/chromium/chrome_metadata_source.cc |
index df7fce75eb8c7c4e741c0f86c11028d7b52e28e3..57c5acd4c2548b6f6d5af7cfc757909d32353c9b 100644 |
--- a/third_party/libaddressinput/chromium/chrome_metadata_source.cc |
+++ b/third_party/libaddressinput/chromium/chrome_metadata_source.cc |
@@ -4,6 +4,8 @@ |
#include "third_party/libaddressinput/chromium/chrome_metadata_source.h" |
+#include <utility> |
+ |
#include "base/logging.h" |
#include "base/macros.h" |
#include "base/memory/scoped_ptr.h" |
@@ -83,9 +85,7 @@ void ChromeMetadataSource::OnURLFetchComplete(const net::URLFetcher* source) { |
ChromeMetadataSource::Request::Request(const std::string& key, |
scoped_ptr<net::URLFetcher> fetcher, |
const Callback& callback) |
- : key(key), |
- fetcher(fetcher.Pass()), |
- callback(callback) {} |
+ : key(key), fetcher(std::move(fetcher)), callback(callback) {} |
void ChromeMetadataSource::Download(const std::string& key, |
const Callback& downloaded) { |
@@ -101,7 +101,7 @@ void ChromeMetadataSource::Download(const std::string& key, |
net::LOAD_DO_NOT_SEND_COOKIES | net::LOAD_DO_NOT_SAVE_COOKIES); |
fetcher->SetRequestContext(getter_); |
- Request* request = new Request(key, fetcher.Pass(), downloaded); |
+ Request* request = new Request(key, std::move(fetcher), downloaded); |
request->fetcher->SaveResponseWithWriter( |
scoped_ptr<net::URLFetcherResponseWriter>( |
new UnownedStringWriter(&request->data))); |