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

Side by Side Diff: chrome/browser/browsing_data/browsing_data_remover.cc

Issue 2334613003: Re-write many calls to WrapUnique() with MakeUnique() (Closed)
Patch Set: Changes from review by sky Created 4 years, 3 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/browser/browsing_data/browsing_data_remover.h" 5 #include "chrome/browser/browsing_data/browsing_data_remover.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 10
(...skipping 389 matching lines...) Expand 10 before | Expand all | Expand 10 after
400 int origin_type_mask, 400 int origin_type_mask,
401 std::unique_ptr<BrowsingDataFilterBuilder> filter_builder, 401 std::unique_ptr<BrowsingDataFilterBuilder> filter_builder,
402 Observer* observer) { 402 Observer* observer) {
403 DCHECK(!observer || observer_list_.HasObserver(observer)) 403 DCHECK(!observer || observer_list_.HasObserver(observer))
404 << "Every observer must register itself (by calling AddObserver()) " 404 << "Every observer must register itself (by calling AddObserver()) "
405 << "before observing a removal task."; 405 << "before observing a removal task.";
406 406
407 // Remove() and RemoveAndReply() pass a null pointer to indicate no filter. 407 // Remove() and RemoveAndReply() pass a null pointer to indicate no filter.
408 // No filter is equivalent to one that |IsEmptyBlacklist()|. 408 // No filter is equivalent to one that |IsEmptyBlacklist()|.
409 if (!filter_builder) { 409 if (!filter_builder) {
410 filter_builder = base::WrapUnique(new RegistrableDomainFilterBuilder( 410 filter_builder = base::MakeUnique<RegistrableDomainFilterBuilder>(
411 RegistrableDomainFilterBuilder::BLACKLIST)); 411 RegistrableDomainFilterBuilder::BLACKLIST);
412 DCHECK(filter_builder->IsEmptyBlacklist()); 412 DCHECK(filter_builder->IsEmptyBlacklist());
413 } 413 }
414 414
415 task_queue_.emplace( 415 task_queue_.emplace(
416 time_range, 416 time_range,
417 remove_mask, 417 remove_mask,
418 origin_type_mask, 418 origin_type_mask,
419 std::move(filter_builder), 419 std::move(filter_builder),
420 observer); 420 observer);
421 421
(...skipping 1108 matching lines...) Expand 10 before | Expand all | Expand 10 after
1530 waiting_for_clear_offline_page_data_ = false; 1530 waiting_for_clear_offline_page_data_ = false;
1531 NotifyIfDone(); 1531 NotifyIfDone();
1532 } 1532 }
1533 #endif 1533 #endif
1534 1534
1535 void BrowsingDataRemover::OnClearedDomainReliabilityMonitor() { 1535 void BrowsingDataRemover::OnClearedDomainReliabilityMonitor() {
1536 DCHECK_CURRENTLY_ON(BrowserThread::UI); 1536 DCHECK_CURRENTLY_ON(BrowserThread::UI);
1537 waiting_for_clear_domain_reliability_monitor_ = false; 1537 waiting_for_clear_domain_reliability_monitor_ = false;
1538 NotifyIfDone(); 1538 NotifyIfDone();
1539 } 1539 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698