| Index: chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api_unittest.cc | 
| diff --git a/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api_unittest.cc b/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api_unittest.cc | 
| index 03fc72d5784f301c89e97d6e7e420fec9a2c58b3..621543583650ef777f9adb56a643b5f0f500f4ec 100644 | 
| --- a/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api_unittest.cc | 
| +++ b/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api_unittest.cc | 
| @@ -44,23 +44,19 @@ class MockDeviceInfoTracker : public DeviceInfoTracker { | 
| return std::unique_ptr<DeviceInfo>(); | 
| } | 
|  | 
| -  static DeviceInfo* CloneDeviceInfo(const DeviceInfo* device_info) { | 
| -    return new DeviceInfo(device_info->guid(), | 
| -                          device_info->client_name(), | 
| -                          device_info->chrome_version(), | 
| -                          device_info->sync_user_agent(), | 
| -                          device_info->device_type(), | 
| -                          device_info->signin_scoped_device_id()); | 
| +  static std::unique_ptr<DeviceInfo> CloneDeviceInfo( | 
| +      const DeviceInfo& device_info) { | 
| +    return base::MakeUnique<DeviceInfo>( | 
| +        device_info.guid(), device_info.client_name(), | 
| +        device_info.chrome_version(), device_info.sync_user_agent(), | 
| +        device_info.device_type(), device_info.signin_scoped_device_id()); | 
| } | 
|  | 
| -  ScopedVector<DeviceInfo> GetAllDeviceInfo() const override { | 
| -    ScopedVector<DeviceInfo> list; | 
| +  std::vector<std::unique_ptr<DeviceInfo>> GetAllDeviceInfo() const override { | 
| +    std::vector<std::unique_ptr<DeviceInfo>> list; | 
|  | 
| -    for (std::vector<const DeviceInfo*>::const_iterator iter = devices_.begin(); | 
| -         iter != devices_.end(); | 
| -         ++iter) { | 
| -      list.push_back(CloneDeviceInfo(*iter)); | 
| -    } | 
| +    for (const DeviceInfo* device : devices_) | 
| +      list.push_back(CloneDeviceInfo(*device)); | 
|  | 
| return list; | 
| } | 
| @@ -109,7 +105,7 @@ TEST(SignedInDevicesAPITest, GetSignedInDevices) { | 
| device_tracker.Add(&device_info1); | 
| device_tracker.Add(&device_info2); | 
|  | 
| -  ScopedVector<DeviceInfo> output1 = GetAllSignedInDevices( | 
| +  std::vector<std::unique_ptr<DeviceInfo>> output1 = GetAllSignedInDevices( | 
| extension_test->id(), &device_tracker, extension_prefs.prefs()); | 
|  | 
| std::string public_id1 = output1[0]->public_id(); | 
| @@ -130,7 +126,7 @@ TEST(SignedInDevicesAPITest, GetSignedInDevices) { | 
|  | 
| device_tracker.Add(&device_info3); | 
|  | 
| -  ScopedVector<DeviceInfo> output2 = GetAllSignedInDevices( | 
| +  std::vector<std::unique_ptr<DeviceInfo>> output2 = GetAllSignedInDevices( | 
| extension_test->id(), &device_tracker, extension_prefs.prefs()); | 
|  | 
| EXPECT_EQ(output2[0]->public_id(), public_id1); | 
| @@ -254,8 +250,8 @@ TEST_F(ExtensionSignedInDevicesTest, DeviceInfoTrackerNotInitialized) { | 
| .WillOnce(Return(&device_tracker)); | 
| EXPECT_CALL(*pss_mock, Shutdown()); | 
|  | 
| -  ScopedVector<DeviceInfo> output = GetAllSignedInDevices( | 
| -      extension()->id(), profile()); | 
| +  std::vector<std::unique_ptr<DeviceInfo>> output = | 
| +      GetAllSignedInDevices(extension()->id(), profile()); | 
|  | 
| EXPECT_TRUE(output.empty()); | 
| } | 
|  |