Index: chrome/browser/ui/webui/browsing_history_handler.h |
diff --git a/chrome/browser/ui/webui/browsing_history_handler.h b/chrome/browser/ui/webui/browsing_history_handler.h |
index b5e5a97d701e8d3884c52b901cc46aac81079692..8c297d55e08cdf73dbf6c066873f311388aa76c9 100644 |
--- a/chrome/browser/ui/webui/browsing_history_handler.h |
+++ b/chrome/browser/ui/webui/browsing_history_handler.h |
@@ -7,10 +7,10 @@ |
#include <stdint.h> |
+#include <memory> |
#include <string> |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/memory/weak_ptr.h" |
#include "base/scoped_observer.h" |
#include "base/strings/string16.h" |
@@ -65,7 +65,7 @@ class BrowsingHistoryHandler : public content::WebUIMessageHandler, |
void SetUrlAndTitle(base::DictionaryValue* result) const; |
// Converts the entry to a DictionaryValue to be owned by the caller. |
- scoped_ptr<base::DictionaryValue> ToValue( |
+ std::unique_ptr<base::DictionaryValue> ToValue( |
bookmarks::BookmarkModel* bookmark_model, |
SupervisedUserService* supervised_user_service, |
const ProfileSyncService* sync_service) const; |
@@ -194,7 +194,7 @@ class BrowsingHistoryHandler : public content::WebUIMessageHandler, |
// The currently-executing request for synced history results. |
// Deleting the request will cancel it. |
- scoped_ptr<history::WebHistoryService::Request> web_history_request_; |
+ std::unique_ptr<history::WebHistoryService::Request> web_history_request_; |
// True if there is a pending delete requests to the history service. |
bool has_pending_delete_request_; |