Index: chrome/browser/chromeos/policy/remote_commands/device_command_screenshot_job.h |
diff --git a/chrome/browser/chromeos/policy/remote_commands/device_command_screenshot_job.h b/chrome/browser/chromeos/policy/remote_commands/device_command_screenshot_job.h |
index 6cd8d502a76ae2904b65edc470b9450073f7aff8..b1b588dd699c488c93b40f07007478a1f6bb2122 100644 |
--- a/chrome/browser/chromeos/policy/remote_commands/device_command_screenshot_job.h |
+++ b/chrome/browser/chromeos/policy/remote_commands/device_command_screenshot_job.h |
@@ -9,12 +9,12 @@ |
#include <list> |
#include <map> |
+#include <memory> |
#include <string> |
#include "base/macros.h" |
#include "base/memory/ref_counted.h" |
#include "base/memory/ref_counted_memory.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/memory/weak_ptr.h" |
#include "base/task_runner.h" |
#include "base/timer/timer.h" |
@@ -83,11 +83,13 @@ class DeviceCommandScreenshotJob : public RemoteCommandJob, |
// Creates a new fully configured instance of an UploadJob. This method |
// may be called any number of times. |
- virtual scoped_ptr<UploadJob> CreateUploadJob(const GURL&, |
- UploadJob::Delegate*) = 0; |
+ virtual std::unique_ptr<UploadJob> CreateUploadJob( |
+ const GURL&, |
+ UploadJob::Delegate*) = 0; |
}; |
- explicit DeviceCommandScreenshotJob(scoped_ptr<Delegate> screenshot_delegate); |
+ explicit DeviceCommandScreenshotJob( |
+ std::unique_ptr<Delegate> screenshot_delegate); |
~DeviceCommandScreenshotJob() override; |
// RemoteCommandJob: |
@@ -129,10 +131,10 @@ class DeviceCommandScreenshotJob : public RemoteCommandJob, |
std::map<int, scoped_refptr<base::RefCountedBytes>> screenshots_; |
// The Delegate is used to acquire screenshots and create UploadJobs. |
- scoped_ptr<Delegate> screenshot_delegate_; |
+ std::unique_ptr<Delegate> screenshot_delegate_; |
// The upload job instance that will upload the screenshots. |
- scoped_ptr<UploadJob> upload_job_; |
+ std::unique_ptr<UploadJob> upload_job_; |
base::WeakPtrFactory<DeviceCommandScreenshotJob> weak_ptr_factory_; |