Index: chrome/service/service_process.h |
diff --git a/chrome/service/service_process.h b/chrome/service/service_process.h |
index dc9cb980185028454a503386604ba06d7bd4bdf5..fde5ce1776d47732ba60772264f007d5d6e6478f 100644 |
--- a/chrome/service/service_process.h |
+++ b/chrome/service/service_process.h |
@@ -5,11 +5,11 @@ |
#ifndef CHROME_SERVICE_SERVICE_PROCESS_H_ |
#define CHROME_SERVICE_SERVICE_PROCESS_H_ |
+#include <memory> |
#include <string> |
#include "base/macros.h" |
#include "base/memory/ref_counted.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/threading/thread.h" |
#include "chrome/service/cloud_print/cloud_print_proxy.h" |
#include "chrome/service/service_ipc_server.h" |
@@ -107,14 +107,14 @@ class ServiceProcess : public ServiceIPCServer::Client, |
// Terminate forces the service process to quit. |
void Terminate(); |
- scoped_ptr<net::NetworkChangeNotifier> network_change_notifier_; |
- scoped_ptr<base::Thread> io_thread_; |
- scoped_ptr<base::Thread> file_thread_; |
+ std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier_; |
+ std::unique_ptr<base::Thread> io_thread_; |
+ std::unique_ptr<base::Thread> file_thread_; |
scoped_refptr<base::SequencedWorkerPool> blocking_pool_; |
- scoped_ptr<cloud_print::CloudPrintProxy> cloud_print_proxy_; |
- scoped_ptr<ServiceProcessPrefs> service_prefs_; |
- scoped_ptr<ServiceIPCServer> ipc_server_; |
- scoped_ptr<ServiceProcessState> service_process_state_; |
+ std::unique_ptr<cloud_print::CloudPrintProxy> cloud_print_proxy_; |
+ std::unique_ptr<ServiceProcessPrefs> service_prefs_; |
+ std::unique_ptr<ServiceIPCServer> ipc_server_; |
+ std::unique_ptr<ServiceProcessState> service_process_state_; |
// An event that will be signalled when we shutdown. |
base::WaitableEvent shutdown_event_; |