Chromium Code Reviews| 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..6599807ca07f49d528520e377a6acb749c0327ae 100644 |
| --- a/chrome/service/service_utility_process_host.h |
| +++ b/chrome/service/service_utility_process_host.h |
| @@ -5,12 +5,12 @@ |
| #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 "build/build_config.h" |
|
Lei Zhang
2016/04/19 01:35:42
Probably not needed?
dcheng
2016/04/19 03:51:33
Done.
|
| #include "content/public/common/child_process_host_delegate.h" |
| #include "ipc/ipc_platform_file.h" |
| @@ -142,7 +142,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 +153,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_; |