diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-01-31 16:33:43 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-02-06 16:33:22 +0000 |
| commit | da51f56cc21233c2d30f0fe0d171727c3102b2e0 (patch) | |
| tree | 4e579ab70ce4b19bee7984237f3ce05a96d59d83 /chromium/chrome/browser/extensions/api/signed_in_devices/id_mapping_helper_unittest.cc | |
| parent | c8c2d1901aec01e934adf561a9fdf0cc776cdef8 (diff) | |
BASELINE: Update Chromium to 65.0.3525.40
Also imports missing submodules
Change-Id: I36901b7c6a325cda3d2c10cedb2186c25af3b79b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/chrome/browser/extensions/api/signed_in_devices/id_mapping_helper_unittest.cc')
| -rw-r--r-- | chromium/chrome/browser/extensions/api/signed_in_devices/id_mapping_helper_unittest.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/chromium/chrome/browser/extensions/api/signed_in_devices/id_mapping_helper_unittest.cc b/chromium/chrome/browser/extensions/api/signed_in_devices/id_mapping_helper_unittest.cc index 83f7d3ad682..6f296a9a38f 100644 --- a/chromium/chrome/browser/extensions/api/signed_in_devices/id_mapping_helper_unittest.cc +++ b/chromium/chrome/browser/extensions/api/signed_in_devices/id_mapping_helper_unittest.cc @@ -8,7 +8,6 @@ #include <string> #include "base/guid.h" -#include "base/memory/ptr_util.h" #include "base/values.h" #include "components/sync/device_info/device_info.h" #include "testing/gmock/include/gmock/gmock.h" @@ -32,11 +31,11 @@ bool VerifyDictionary( TEST(IdMappingHelperTest, SetIdsForDevices) { std::vector<std::unique_ptr<DeviceInfo>> devices; - devices.push_back(base::MakeUnique<DeviceInfo>( + devices.push_back(std::make_unique<DeviceInfo>( base::GenerateGUID(), "abc Device", "XYZ v1", "XYZ SyncAgent v1", sync_pb::SyncEnums_DeviceType_TYPE_LINUX, "device_id1")); - devices.push_back(base::MakeUnique<DeviceInfo>( + devices.push_back(std::make_unique<DeviceInfo>( base::GenerateGUID(), "def Device", "XYZ v1", "XYZ SyncAgent v1", sync_pb::SyncEnums_DeviceType_TYPE_LINUX, "device_id2")); @@ -53,7 +52,7 @@ TEST(IdMappingHelperTest, SetIdsForDevices) { EXPECT_NE(public_id1, public_id2); // Now add a third device. - devices.push_back(base::MakeUnique<DeviceInfo>( + devices.push_back(std::make_unique<DeviceInfo>( base::GenerateGUID(), "ghi Device", "XYZ v1", "XYZ SyncAgent v1", sync_pb::SyncEnums_DeviceType_TYPE_LINUX, "device_id3")); |