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

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

Issue 398273006: Revert 284234 "Pass signin_scoped_device_id to DeviceInfoSpecifics." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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: trunk/src/chrome/browser/extensions/api/signed_in_devices/id_mapping_helper_unittest.cc
===================================================================
--- trunk/src/chrome/browser/extensions/api/signed_in_devices/id_mapping_helper_unittest.cc (revision 284241)
+++ trunk/src/chrome/browser/extensions/api/signed_in_devices/id_mapping_helper_unittest.cc (working copy)
@@ -31,19 +31,13 @@
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,
- "device_id1"));
+ 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,
- "device_id2"));
+ devices.push_back(new DeviceInfo(
+ base::GenerateGUID(), "def Device", "XYZ v1", "XYZ SyncAgent v1",
+ sync_pb::SyncEnums_DeviceType_TYPE_LINUX));
base::DictionaryValue dictionary;
@@ -58,12 +52,9 @@
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,
- "device_id3"));
+ devices.push_back(new DeviceInfo(
+ base::GenerateGUID(), "ghi Device", "XYZ v1", "XYZ SyncAgent v1",
+ sync_pb::SyncEnums_DeviceType_TYPE_LINUX));
CreateMappingForUnmappedDevices(&(devices.get()), &dictionary);
Property changes on: trunk/src/chrome/browser/extensions/api/signed_in_devices/id_mapping_helper_unittest.cc
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-LF
\ No newline at end of property

Powered by Google App Engine
This is Rietveld 408576698