Index: net/cookies/cookie_monster.h |
diff --git a/net/cookies/cookie_monster.h b/net/cookies/cookie_monster.h |
index 4d36c62dd370fec67828623b0af2b31343320575..b31ac6d4b6fab663ea60ddd0b2b17ba3a651c3b1 100644 |
--- a/net/cookies/cookie_monster.h |
+++ b/net/cookies/cookie_monster.h |
@@ -12,6 +12,7 @@ |
#include <deque> |
#include <map> |
+#include <memory> |
#include <queue> |
#include <set> |
#include <string> |
@@ -23,7 +24,6 @@ |
#include "base/macros.h" |
#include "base/memory/linked_ptr.h" |
#include "base/memory/ref_counted.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/memory/weak_ptr.h" |
#include "base/threading/thread_checker.h" |
#include "base/time/time.h" |
@@ -210,7 +210,7 @@ class NET_EXPORT CookieMonster : public CookieStore { |
static const char* const kDefaultCookieableSchemes[]; |
static const int kDefaultCookieableSchemesCount; |
- scoped_ptr<CookieChangedSubscription> AddCallbackForCookie( |
+ std::unique_ptr<CookieChangedSubscription> AddCallbackForCookie( |
const GURL& url, |
const std::string& name, |
const CookieChangedCallback& callback) override; |
@@ -519,7 +519,7 @@ class NET_EXPORT CookieMonster : public CookieStore { |
// Helper function that sets a canonical cookie, deleting equivalents and |
// performing garbage collection. |
- bool SetCanonicalCookie(scoped_ptr<CanonicalCookie> cc, |
+ bool SetCanonicalCookie(std::unique_ptr<CanonicalCookie> cc, |
const CookieOptions& options); |
// Helper function calling SetCanonicalCookie() for all cookies in |list|. |