| Index: chrome/browser/extensions/api/image_writer_private/test_utils.cc
 | 
| diff --git a/chrome/browser/extensions/api/image_writer_private/test_utils.cc b/chrome/browser/extensions/api/image_writer_private/test_utils.cc
 | 
| index 51f84d4c2706197042ba34deee56286377048b98..18b8a2cb9c2c815b2dbd66d33e7cc24a22815a25 100644
 | 
| --- a/chrome/browser/extensions/api/image_writer_private/test_utils.cc
 | 
| +++ b/chrome/browser/extensions/api/image_writer_private/test_utils.cc
 | 
| @@ -165,10 +165,10 @@ void ImageWriterTestUtils::SetUp(bool is_browser_test) {
 | 
|  
 | 
|  #if defined(OS_CHROMEOS)
 | 
|    if (!chromeos::DBusThreadManager::IsInitialized()) {
 | 
| -    scoped_ptr<chromeos::DBusThreadManagerSetter> dbus_setter =
 | 
| +    std::unique_ptr<chromeos::DBusThreadManagerSetter> dbus_setter =
 | 
|          chromeos::DBusThreadManager::GetSetterForTesting();
 | 
| -    scoped_ptr<chromeos::ImageBurnerClient>
 | 
| -        image_burner_fake(new ImageWriterFakeImageBurnerClient());
 | 
| +    std::unique_ptr<chromeos::ImageBurnerClient> image_burner_fake(
 | 
| +        new ImageWriterFakeImageBurnerClient());
 | 
|      dbus_setter->SetImageBurnerClient(std::move(image_burner_fake));
 | 
|    }
 | 
|  
 | 
| @@ -230,8 +230,8 @@ FakeImageWriterClient* ImageWriterTestUtils::GetUtilityClient() {
 | 
|  #endif
 | 
|  
 | 
|  bool ImageWriterTestUtils::ImageWrittenToDevice() {
 | 
| -  scoped_ptr<char[]> image_buffer(new char[kTestFileSize]);
 | 
| -  scoped_ptr<char[]> device_buffer(new char[kTestFileSize]);
 | 
| +  std::unique_ptr<char[]> image_buffer(new char[kTestFileSize]);
 | 
| +  std::unique_ptr<char[]> device_buffer(new char[kTestFileSize]);
 | 
|  
 | 
|    int image_bytes_read =
 | 
|        ReadFile(test_image_path_, image_buffer.get(), kTestFileSize);
 | 
| @@ -251,7 +251,7 @@ bool ImageWriterTestUtils::ImageWrittenToDevice() {
 | 
|  bool ImageWriterTestUtils::FillFile(const base::FilePath& file,
 | 
|                                      const int pattern,
 | 
|                                      const int length) {
 | 
| -  scoped_ptr<char[]> buffer(new char[length]);
 | 
| +  std::unique_ptr<char[]> buffer(new char[length]);
 | 
|    memset(buffer.get(), pattern, length);
 | 
|  
 | 
|    return base::WriteFile(file, buffer.get(), length) == length;
 | 
| 
 |