Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(74)

Side by Side Diff: third_party/libaddressinput/chromium/chrome_metadata_source.cc

Issue 1911823002: Convert //third_party from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update crashpad's README.chromium Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "third_party/libaddressinput/chromium/chrome_metadata_source.h" 5 #include "third_party/libaddressinput/chromium/chrome_metadata_source.h"
6 6
7 #include <memory>
7 #include <utility> 8 #include <utility>
8 9
9 #include "base/logging.h" 10 #include "base/logging.h"
10 #include "base/macros.h" 11 #include "base/macros.h"
11 #include "base/memory/scoped_ptr.h"
12 #include "base/stl_util.h" 12 #include "base/stl_util.h"
13 #include "net/base/io_buffer.h" 13 #include "net/base/io_buffer.h"
14 #include "net/base/load_flags.h" 14 #include "net/base/load_flags.h"
15 #include "net/base/net_errors.h" 15 #include "net/base/net_errors.h"
16 #include "net/http/http_status_code.h" 16 #include "net/http/http_status_code.h"
17 #include "net/url_request/url_fetcher.h" 17 #include "net/url_request/url_fetcher.h"
18 #include "net/url_request/url_fetcher_response_writer.h" 18 #include "net/url_request/url_fetcher_response_writer.h"
19 #include "url/gurl.h" 19 #include "url/gurl.h"
20 20
21 namespace autofill { 21 namespace autofill {
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 const Callback& downloaded) const { 66 const Callback& downloaded) const {
67 const_cast<ChromeMetadataSource*>(this)->Download(key, downloaded); 67 const_cast<ChromeMetadataSource*>(this)->Download(key, downloaded);
68 } 68 }
69 69
70 void ChromeMetadataSource::OnURLFetchComplete(const net::URLFetcher* source) { 70 void ChromeMetadataSource::OnURLFetchComplete(const net::URLFetcher* source) {
71 std::map<const net::URLFetcher*, Request*>::iterator request = 71 std::map<const net::URLFetcher*, Request*>::iterator request =
72 requests_.find(source); 72 requests_.find(source);
73 DCHECK(request != requests_.end()); 73 DCHECK(request != requests_.end());
74 74
75 bool ok = source->GetResponseCode() == net::HTTP_OK; 75 bool ok = source->GetResponseCode() == net::HTTP_OK;
76 scoped_ptr<std::string> data(new std::string()); 76 std::unique_ptr<std::string> data(new std::string());
77 if (ok) 77 if (ok)
78 data->swap(request->second->data); 78 data->swap(request->second->data);
79 request->second->callback(ok, request->second->key, data.release()); 79 request->second->callback(ok, request->second->key, data.release());
80 80
81 delete request->second; 81 delete request->second;
82 requests_.erase(request); 82 requests_.erase(request);
83 } 83 }
84 84
85 ChromeMetadataSource::Request::Request(const std::string& key, 85 ChromeMetadataSource::Request::Request(const std::string& key,
86 scoped_ptr<net::URLFetcher> fetcher, 86 std::unique_ptr<net::URLFetcher> fetcher,
87 const Callback& callback) 87 const Callback& callback)
88 : key(key), fetcher(std::move(fetcher)), callback(callback) {} 88 : key(key), fetcher(std::move(fetcher)), callback(callback) {}
89 89
90 void ChromeMetadataSource::Download(const std::string& key, 90 void ChromeMetadataSource::Download(const std::string& key,
91 const Callback& downloaded) { 91 const Callback& downloaded) {
92 GURL resource(validation_data_url_ + key); 92 GURL resource(validation_data_url_ + key);
93 if (!resource.SchemeIsCryptographic()) { 93 if (!resource.SchemeIsCryptographic()) {
94 downloaded(false, key, NULL); 94 downloaded(false, key, NULL);
95 return; 95 return;
96 } 96 }
97 97
98 scoped_ptr<net::URLFetcher> fetcher = 98 std::unique_ptr<net::URLFetcher> fetcher =
99 net::URLFetcher::Create(resource, net::URLFetcher::GET, this); 99 net::URLFetcher::Create(resource, net::URLFetcher::GET, this);
100 fetcher->SetLoadFlags( 100 fetcher->SetLoadFlags(
101 net::LOAD_DO_NOT_SEND_COOKIES | net::LOAD_DO_NOT_SAVE_COOKIES); 101 net::LOAD_DO_NOT_SEND_COOKIES | net::LOAD_DO_NOT_SAVE_COOKIES);
102 fetcher->SetRequestContext(getter_); 102 fetcher->SetRequestContext(getter_);
103 103
104 Request* request = new Request(key, std::move(fetcher), downloaded); 104 Request* request = new Request(key, std::move(fetcher), downloaded);
105 request->fetcher->SaveResponseWithWriter( 105 request->fetcher->SaveResponseWithWriter(
106 scoped_ptr<net::URLFetcherResponseWriter>( 106 std::unique_ptr<net::URLFetcherResponseWriter>(
107 new UnownedStringWriter(&request->data))); 107 new UnownedStringWriter(&request->data)));
108 requests_[request->fetcher.get()] = request; 108 requests_[request->fetcher.get()] = request;
109 request->fetcher->Start(); 109 request->fetcher->Start();
110 } 110 }
111 111
112 } // namespace autofill 112 } // namespace autofill
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698