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

Unified Diff: chrome/browser/bitmap_fetcher/bitmap_fetcher_service.cc

Issue 2767893002: Remove ScopedVector from chrome/browser/. (Closed)
Patch Set: Address comments from zea@ Created 3 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/bitmap_fetcher/bitmap_fetcher_service.cc
diff --git a/chrome/browser/bitmap_fetcher/bitmap_fetcher_service.cc b/chrome/browser/bitmap_fetcher/bitmap_fetcher_service.cc
index fcca01f9460598f19eea87796cbbe7519fae4289..84aece2516f83f6c33cd75c840c9d502070fce07 100644
--- a/chrome/browser/bitmap_fetcher/bitmap_fetcher_service.cc
+++ b/chrome/browser/bitmap_fetcher/bitmap_fetcher_service.cc
@@ -71,8 +71,7 @@ BitmapFetcherService::~BitmapFetcherService() {
}
void BitmapFetcherService::CancelRequest(int request_id) {
- ScopedVector<BitmapFetcherRequest>::iterator iter;
- for (iter = requests_.begin(); iter != requests_.end(); ++iter) {
+ for (auto iter = requests_.begin(); iter != requests_.end(); ++iter) {
if ((*iter)->request_id() == request_id) {
requests_.erase(iter);
// Deliberately leave the associated fetcher running to populate cache.
@@ -90,8 +89,7 @@ BitmapFetcherService::RequestId BitmapFetcherService::RequestImage(
if (current_request_id_ == REQUEST_ID_INVALID)
++current_request_id_;
int request_id = current_request_id_;
- std::unique_ptr<BitmapFetcherRequest> request(
- new BitmapFetcherRequest(request_id, observer));
+ auto request = base::MakeUnique<BitmapFetcherRequest>(request_id, observer);
// Reject invalid URLs.
if (!url.is_valid())
@@ -116,7 +114,7 @@ BitmapFetcherService::RequestId BitmapFetcherService::RequestImage(
EnsureFetcherForUrl(url, traffic_annotation);
request->set_fetcher(fetcher);
- requests_.push_back(request.release());
+ requests_.push_back(std::move(request));
return requests_.back()->request_id();
}
@@ -182,7 +180,7 @@ void BitmapFetcherService::OnFetchComplete(const GURL& url,
DCHECK(fetcher);
// Notify all attached requests of completion.
- ScopedVector<BitmapFetcherRequest>::iterator iter = requests_.begin();
+ auto iter = requests_.begin();
while (iter != requests_.end()) {
if ((*iter)->get_fetcher() == fetcher) {
(*iter)->NotifyImageChanged(bitmap);

Powered by Google App Engine
This is Rietveld 408576698