Pass signin_scoped_device_id to DeviceInfoSpecifics.

chrome/browser/extensions/api/signed_in_devices/id_mapping_helper_unittest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 
 #include "base/guid.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/values.h"
@@ skipping 13 matching lines @@
   if (dictionary.GetString(path, &out)) {
     return (out == expected_value);
   }
 
   return false;
 }
 
 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(),
+                                   "abc Device",
+                                   "XYZ v1",
+                                   "XYZ SyncAgent v1",
+                                   sync_pb::SyncEnums_DeviceType_TYPE_LINUX,
+                                   "device_id"));

[rlarocque, 2014/07/16 00:44:31]

Not that it really matters, but would it be more realistic if the "device_id"
string were different for each of these?

[pavely, 2014/07/16 21:35:59]

Done.

 
-  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(),
+                                   "def Device",
+                                   "XYZ v1",
+                                   "XYZ SyncAgent v1",
+                                   sync_pb::SyncEnums_DeviceType_TYPE_LINUX,
+                                   "device_id"));
 
   base::DictionaryValue dictionary;
 
   CreateMappingForUnmappedDevices(&(devices.get()), &dictionary);
 
   std::string public_id1 = devices[0]->public_id();
   std::string public_id2 = devices[1]->public_id();
 
   EXPECT_FALSE(public_id1.empty());
   EXPECT_FALSE(public_id2.empty());
 
   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_id"));
 
   CreateMappingForUnmappedDevices(&(devices.get()), &dictionary);
 
   // Now make sure the existing ids are not changed.
   EXPECT_EQ(public_id1, devices[0]->public_id());
   EXPECT_EQ(public_id2, devices[1]->public_id());
 
   // Now make sure the id for third device is non empty and different.
   std::string public_id3 = devices[2]->public_id();
   EXPECT_FALSE(public_id3.empty());
   EXPECT_NE(public_id3, public_id1);
   EXPECT_NE(public_id3, public_id2);
 
   // Verify the dictionary.
   EXPECT_TRUE(VerifyDictionary(public_id1, devices[0]->guid(), dictionary));
   EXPECT_TRUE(VerifyDictionary(public_id2, devices[1]->guid(), dictionary));
   EXPECT_TRUE(VerifyDictionary(public_id3, devices[2]->guid(), dictionary));
 
   EXPECT_EQ(dictionary.size(), 3U);
 }
 }  // namespace extensions