| Index: chrome/service/service_utility_process_host.h
|
| diff --git a/chrome/service/service_utility_process_host.h b/chrome/service/service_utility_process_host.h
|
| index 024a85ffb9f78aba7368c1cfb78456d075cf936a..d5c3fe633a0a0328636a25245e8167d317d205c3 100644
|
| --- a/chrome/service/service_utility_process_host.h
|
| +++ b/chrome/service/service_utility_process_host.h
|
| @@ -5,11 +5,10 @@
|
| #ifndef CHROME_SERVICE_SERVICE_UTILITY_PROCESS_HOST_H_
|
| #define CHROME_SERVICE_SERVICE_UTILITY_PROCESS_HOST_H_
|
|
|
| -#include "build/build_config.h"
|
| +#include <memory>
|
|
|
| #include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "content/public/common/child_process_host_delegate.h"
|
| #include "ipc/ipc_platform_file.h"
|
| @@ -142,7 +141,7 @@ class ServiceUtilityProcessHost : public content::ChildProcessHostDelegate {
|
| void OnGetPrinterSemanticCapsAndDefaultsFailed(
|
| const std::string& printer_name);
|
|
|
| - scoped_ptr<content::ChildProcessHost> child_process_host_;
|
| + std::unique_ptr<content::ChildProcessHost> child_process_host_;
|
| base::Process process_;
|
| // A pointer to our client interface, who will be informed of progress.
|
| scoped_refptr<Client> client_;
|
| @@ -153,7 +152,7 @@ class ServiceUtilityProcessHost : public content::ChildProcessHostDelegate {
|
| base::Time start_time_;
|
|
|
| class PdfToEmfState;
|
| - scoped_ptr<PdfToEmfState> pdf_to_emf_state_;
|
| + std::unique_ptr<PdfToEmfState> pdf_to_emf_state_;
|
|
|
| base::WeakPtrFactory<ServiceUtilityProcessHost> weak_ptr_factory_;
|
|
|
|
|