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

Unified Diff: ios/chrome/browser/browsing_data/browsing_data_remover_helper.h

Issue 1861593005: Convert //ios from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add header 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 side-by-side diff with in-line comments
Download patch
Index: ios/chrome/browser/browsing_data/browsing_data_remover_helper.h
diff --git a/ios/chrome/browser/browsing_data/browsing_data_remover_helper.h b/ios/chrome/browser/browsing_data/browsing_data_remover_helper.h
index 9ae632aac6488fb32c47381f42ba1452172a0315..a5b73e9d4162fae5f815ba011452a0d5f01cbef7 100644
--- a/ios/chrome/browser/browsing_data/browsing_data_remover_helper.h
+++ b/ios/chrome/browser/browsing_data/browsing_data_remover_helper.h
@@ -6,10 +6,10 @@
#define IOS_CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_REMOVER_HELPER_H_
#include <map>
+#include <memory>
#include <vector>
#include "base/callback.h"
-#include "base/memory/scoped_ptr.h"
#include "ios/chrome/browser/browsing_data/ios_chrome_browsing_data_remover.h"
namespace ios {
@@ -56,14 +56,14 @@ class BrowsingDataRemoverHelper
// IOSChromeBrowsingDataRemover
// must not be running.
void DoRemove(ios::ChromeBrowserState* browser_state,
- scoped_ptr<BrowsingDataRemovalInfo> removal_info);
+ std::unique_ptr<BrowsingDataRemovalInfo> removal_info);
// A map that contains the all the ChromeBrowserStates that have a removal
// operation pending along with their associated BrowsingDataRemovalInfo.
- std::map<ios::ChromeBrowserState*, scoped_ptr<BrowsingDataRemovalInfo>>
+ std::map<ios::ChromeBrowserState*, std::unique_ptr<BrowsingDataRemovalInfo>>
pending_removals_;
// The BrowsingDataRemovalInfo of the currently enqueued removal operation.
- scoped_ptr<BrowsingDataRemovalInfo> current_removal_info_;
+ std::unique_ptr<BrowsingDataRemovalInfo> current_removal_info_;
// The actual object that perfoms the removal of browsing data.
IOSChromeBrowsingDataRemover* current_remover_;
};

Powered by Google App Engine
This is Rietveld 408576698