Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(960)

Unified Diff: chrome/browser/extensions/api/signed_in_devices/id_mapping_helper_unittest.cc

Issue 395013002: Pass signin_scoped_device_id to DeviceInfoSpecifics. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Revers chrome_signin_client Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/api/signed_in_devices/id_mapping_helper_unittest.cc
diff --git a/chrome/browser/extensions/api/signed_in_devices/id_mapping_helper_unittest.cc b/chrome/browser/extensions/api/signed_in_devices/id_mapping_helper_unittest.cc
index b514b4b7f91916bedb0c1c4b4c0fe1f10e834af8..24647035cd4c3193f3d3cf820ed96c41c829e8f6 100644
--- a/chrome/browser/extensions/api/signed_in_devices/id_mapping_helper_unittest.cc
+++ b/chrome/browser/extensions/api/signed_in_devices/id_mapping_helper_unittest.cc
@@ -31,13 +31,19 @@ bool VerifyDictionary(
TEST(IdMappingHelperTest, SetIdsForDevices) {
ScopedVector<DeviceInfo> devices;
- devices.push_back(new DeviceInfo(
- base::GenerateGUID(), "abc Device", "XYZ v1", "XYZ SyncAgent v1",
- sync_pb::SyncEnums_DeviceType_TYPE_LINUX));
-
- devices.push_back(new DeviceInfo(
- base::GenerateGUID(), "def Device", "XYZ v1", "XYZ SyncAgent v1",
- sync_pb::SyncEnums_DeviceType_TYPE_LINUX));
+ devices.push_back(new DeviceInfo(base::GenerateGUID(),
+ "abc Device",
+ "XYZ v1",
+ "XYZ SyncAgent v1",
+ sync_pb::SyncEnums_DeviceType_TYPE_LINUX,
+ "device_id1"));
+
+ devices.push_back(new DeviceInfo(base::GenerateGUID(),
+ "def Device",
+ "XYZ v1",
+ "XYZ SyncAgent v1",
+ sync_pb::SyncEnums_DeviceType_TYPE_LINUX,
+ "device_id2"));
base::DictionaryValue dictionary;
@@ -52,9 +58,12 @@ TEST(IdMappingHelperTest, SetIdsForDevices) {
EXPECT_NE(public_id1, public_id2);
// Now add a third device.
- devices.push_back(new DeviceInfo(
- base::GenerateGUID(), "ghi Device", "XYZ v1", "XYZ SyncAgent v1",
- sync_pb::SyncEnums_DeviceType_TYPE_LINUX));
+ devices.push_back(new DeviceInfo(base::GenerateGUID(),
+ "ghi Device",
+ "XYZ v1",
+ "XYZ SyncAgent v1",
+ sync_pb::SyncEnums_DeviceType_TYPE_LINUX,
+ "device_id3"));
CreateMappingForUnmappedDevices(&(devices.get()), &dictionary);

Powered by Google App Engine
This is Rietveld 408576698