| Index: sync/tools/sync_listen_notifications.cc
|
| diff --git a/sync/tools/sync_listen_notifications.cc b/sync/tools/sync_listen_notifications.cc
|
| index 3e896f19bc59910897ea07913d9bbb962da9d2cf..aec1a547daf7b7b1f61889ec392cc64eb01761e9 100644
|
| --- a/sync/tools/sync_listen_notifications.cc
|
| +++ b/sync/tools/sync_listen_notifications.cc
|
| @@ -4,6 +4,7 @@
|
|
|
| #include <cstddef>
|
| #include <cstdio>
|
| +#include <memory>
|
| #include <string>
|
|
|
| #include "base/at_exit.h"
|
| @@ -11,8 +12,8 @@
|
| #include "base/compiler_specific.h"
|
| #include "base/logging.h"
|
| #include "base/macros.h"
|
| +#include "base/memory/ptr_util.h"
|
| #include "base/memory/ref_counted.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/message_loop/message_loop.h"
|
| #include "base/rand_util.h"
|
| #include "base/threading/thread.h"
|
| @@ -83,7 +84,7 @@ class MyTestURLRequestContext : public net::TestURLRequestContext {
|
| context_storage_.set_host_resolver(
|
| net::HostResolver::CreateDefaultResolver(NULL));
|
| context_storage_.set_transport_security_state(
|
| - make_scoped_ptr(new net::TransportSecurityState()));
|
| + base::WrapUnique(new net::TransportSecurityState()));
|
| Init();
|
| }
|
|
|
| @@ -107,7 +108,7 @@ class MyTestURLRequestContextGetter : public net::TestURLRequestContextGetter {
|
| private:
|
| ~MyTestURLRequestContextGetter() override {}
|
|
|
| - scoped_ptr<MyTestURLRequestContext> context_;
|
| + std::unique_ptr<MyTestURLRequestContext> context_;
|
| };
|
|
|
| notifier::NotifierOptions ParseNotifierOptions(
|
| @@ -174,7 +175,7 @@ int SyncListenNotificationsMain(int argc, char* argv[]) {
|
| }
|
|
|
| // Set up objects that monitor the network.
|
| - scoped_ptr<net::NetworkChangeNotifier> network_change_notifier(
|
| + std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier(
|
| net::NetworkChangeNotifier::Create());
|
|
|
| const notifier::NotifierOptions& notifier_options =
|
| @@ -186,15 +187,12 @@ int SyncListenNotificationsMain(int argc, char* argv[]) {
|
| notifier_options);
|
| const char kClientInfo[] = "sync_listen_notifications";
|
| NullInvalidationStateTracker null_invalidation_state_tracker;
|
| - scoped_ptr<Invalidator> invalidator(
|
| - new NonBlockingInvalidator(
|
| - network_channel_creator,
|
| - base::RandBytesAsString(8),
|
| - null_invalidation_state_tracker.GetSavedInvalidations(),
|
| - null_invalidation_state_tracker.GetBootstrapData(),
|
| - &null_invalidation_state_tracker,
|
| - kClientInfo,
|
| - notifier_options.request_context_getter));
|
| + std::unique_ptr<Invalidator> invalidator(new NonBlockingInvalidator(
|
| + network_channel_creator, base::RandBytesAsString(8),
|
| + null_invalidation_state_tracker.GetSavedInvalidations(),
|
| + null_invalidation_state_tracker.GetBootstrapData(),
|
| + &null_invalidation_state_tracker, kClientInfo,
|
| + notifier_options.request_context_getter));
|
|
|
| NotificationPrinter notification_printer;
|
|
|
|
|