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

Unified Diff: chrome/browser/safe_browsing/protocol_manager.h

Issue 1870003002: Convert //chrome/browser/safe_browsing from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase and address comments 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
« no previous file with comments | « chrome/browser/safe_browsing/ping_manager.cc ('k') | chrome/browser/safe_browsing/protocol_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/safe_browsing/protocol_manager.h
diff --git a/chrome/browser/safe_browsing/protocol_manager.h b/chrome/browser/safe_browsing/protocol_manager.h
index 8800c951d272a0e3c14a934b1484094e43c652fb..aecf832b658722f94a7ba3bbd6d5d8b19d5e3fec 100644
--- a/chrome/browser/safe_browsing/protocol_manager.h
+++ b/chrome/browser/safe_browsing/protocol_manager.h
@@ -13,17 +13,17 @@
// and handling responses from, Google's SafeBrowsing servers. This class uses
// The SafeBrowsingProtocolParser class to do the actual parsing.
+#include <stddef.h>
+
#include <deque>
+#include <memory>
#include <set>
#include <string>
#include <vector>
-#include <stddef.h>
-
#include "base/containers/hash_tables.h"
#include "base/gtest_prod_util.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/threading/non_thread_safe.h"
#include "base/time/time.h"
#include "base/timer/timer.h"
@@ -302,7 +302,7 @@ class SafeBrowsingProtocolManager : public net::URLFetcherDelegate,
// Current active request (in case we need to cancel) for updates or chunks
// from the SafeBrowsing service. We can only have one of these outstanding
// at any given time unlike GetHash requests, which are tracked separately.
- scoped_ptr<net::URLFetcher> request_;
+ std::unique_ptr<net::URLFetcher> request_;
// The kind of request that is currently in progress.
SafeBrowsingRequestType request_type_;
@@ -433,12 +433,12 @@ class SafeBrowsingProtocolManagerDelegate {
// call at a later time.
virtual void AddChunks(
const std::string& list,
- scoped_ptr<std::vector<scoped_ptr<SBChunkData>>> chunks,
+ std::unique_ptr<std::vector<std::unique_ptr<SBChunkData>>> chunks,
AddChunksCallback callback) = 0;
// Delete chunks from the database.
virtual void DeleteChunks(
- scoped_ptr<std::vector<SBChunkDelete> > chunk_deletes) = 0;
+ std::unique_ptr<std::vector<SBChunkDelete>> chunk_deletes) = 0;
};
} // namespace safe_browsing
« no previous file with comments | « chrome/browser/safe_browsing/ping_manager.cc ('k') | chrome/browser/safe_browsing/protocol_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698