Index: chrome/browser/ui/webui/sync_internals_message_handler.cc |
diff --git a/chrome/browser/ui/webui/sync_internals_message_handler.cc b/chrome/browser/ui/webui/sync_internals_message_handler.cc |
index bfcdd24cb389a36131731321e995e7442090152d..12509a26b158d5aaf5c5cf2d8b6fe19c9dc72dc4 100644 |
--- a/chrome/browser/ui/webui/sync_internals_message_handler.cc |
+++ b/chrome/browser/ui/webui/sync_internals_message_handler.cc |
@@ -8,6 +8,7 @@ |
#include <vector> |
#include "base/logging.h" |
+#include "base/memory/ptr_util.h" |
#include "chrome/browser/profiles/profile.h" |
#include "chrome/browser/sync/profile_sync_service_factory.h" |
#include "chrome/common/channel_info.h" |
@@ -31,7 +32,7 @@ using syncer::WeakHandle; |
namespace { |
class UtilAboutSyncDataExtractor : public AboutSyncDataExtractor { |
public: |
- scoped_ptr<base::DictionaryValue> ConstructAboutInformation( |
+ std::unique_ptr<base::DictionaryValue> ConstructAboutInformation( |
sync_driver::SyncService* service, |
SigninManagerBase* signin) override { |
return sync_driver::sync_ui_util::ConstructAboutInformation( |
@@ -42,10 +43,10 @@ class UtilAboutSyncDataExtractor : public AboutSyncDataExtractor { |
SyncInternalsMessageHandler::SyncInternalsMessageHandler() |
: SyncInternalsMessageHandler( |
- make_scoped_ptr(new UtilAboutSyncDataExtractor())) {} |
+ base::WrapUnique(new UtilAboutSyncDataExtractor())) {} |
SyncInternalsMessageHandler::SyncInternalsMessageHandler( |
- scoped_ptr<AboutSyncDataExtractor> about_sync_data_extractor) |
+ std::unique_ptr<AboutSyncDataExtractor> about_sync_data_extractor) |
: about_sync_data_extractor_(std::move(about_sync_data_extractor)), |
weak_ptr_factory_(this) {} |
@@ -136,7 +137,7 @@ void SyncInternalsMessageHandler::HandleRequestListOfTypes( |
const base::ListValue* args) { |
DCHECK(args->empty()); |
base::DictionaryValue event_details; |
- scoped_ptr<base::ListValue> type_list(new base::ListValue()); |
+ std::unique_ptr<base::ListValue> type_list(new base::ListValue()); |
ModelTypeSet protocol_types = syncer::ProtocolTypes(); |
for (ModelTypeSet::Iterator it = protocol_types.First(); |
it.Good(); it.Inc()) { |
@@ -166,7 +167,7 @@ void SyncInternalsMessageHandler::HandleGetAllNodes( |
void SyncInternalsMessageHandler::OnReceivedAllNodes( |
int request_id, |
- scoped_ptr<base::ListValue> nodes) { |
+ std::unique_ptr<base::ListValue> nodes) { |
base::FundamentalValue id(request_id); |
web_ui()->CallJavascriptFunction( |
sync_driver::sync_ui_util::kGetAllNodesCallback, id, *nodes); |
@@ -178,7 +179,7 @@ void SyncInternalsMessageHandler::OnStateChanged() { |
void SyncInternalsMessageHandler::OnProtocolEvent( |
const syncer::ProtocolEvent& event) { |
- scoped_ptr<base::DictionaryValue> value( |
+ std::unique_ptr<base::DictionaryValue> value( |
syncer::ProtocolEvent::ToValue(event)); |
web_ui()->CallJavascriptFunction( |
sync_driver::sync_ui_util::kDispatchEvent, |
@@ -209,8 +210,8 @@ void SyncInternalsMessageHandler::OnStatusCountersUpdated( |
void SyncInternalsMessageHandler::EmitCounterUpdate( |
syncer::ModelType type, |
const std::string& counter_type, |
- scoped_ptr<base::DictionaryValue> value) { |
- scoped_ptr<base::DictionaryValue> details(new base::DictionaryValue()); |
+ std::unique_ptr<base::DictionaryValue> value) { |
+ std::unique_ptr<base::DictionaryValue> details(new base::DictionaryValue()); |
details->SetString(sync_driver::sync_ui_util::kModelType, |
ModelTypeToString(type)); |
details->SetString(sync_driver::sync_ui_util::kCounterType, counter_type); |
@@ -233,7 +234,7 @@ void SyncInternalsMessageHandler::HandleJsEvent( |
void SyncInternalsMessageHandler::SendAboutInfo() { |
ProfileSyncService* sync_service = GetProfileSyncService(); |
SigninManagerBase* signin = sync_service ? sync_service->signin() : nullptr; |
- scoped_ptr<base::DictionaryValue> value = |
+ std::unique_ptr<base::DictionaryValue> value = |
about_sync_data_extractor_->ConstructAboutInformation(sync_service, |
signin); |
web_ui()->CallJavascriptFunction( |