Revert 284234 "Pass signin_scoped_device_id to DeviceInfoSpecifics."

trunk/src/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api_unittest.cc

Index: trunk/src/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api_unittest.cc
===================================================================
--- trunk/src/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api_unittest.cc	(revision 284241)
+++ trunk/src/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api_unittest.cc	(working copy)
@@ -39,19 +39,15 @@
   scoped_refptr<Extension> extension_test =
       extension_prefs.AddExtension(extension_name);
 
-  DeviceInfo device_info1(base::GenerateGUID(),
-                          "abc Device",
-                          "XYZ v1",
-                          "XYZ SyncAgent v1",
-                          sync_pb::SyncEnums_DeviceType_TYPE_LINUX,
-                          "device_id");
+  DeviceInfo device_info1(
+      base::GenerateGUID(),
+      "abc Device", "XYZ v1", "XYZ SyncAgent v1",
+      sync_pb::SyncEnums_DeviceType_TYPE_LINUX);
 
-  DeviceInfo device_info2(base::GenerateGUID(),
-                          "def Device",
-                          "XYZ v2",
-                          "XYZ SyncAgent v2",
-                          sync_pb::SyncEnums_DeviceType_TYPE_LINUX,
-                          "device_id");
+  DeviceInfo device_info2(
+      base::GenerateGUID(),
+      "def Device", "XYZ v2", "XYZ SyncAgent v2",
+      sync_pb::SyncEnums_DeviceType_TYPE_LINUX);
 
   std::vector<DeviceInfo*> devices;
   devices.push_back(&device_info1);
@@ -78,12 +74,10 @@
 
   // Add a third device and make sure the first 2 ids are retained and a new
   // id is generated for the third device.
-  DeviceInfo device_info3(base::GenerateGUID(),
-                          "def Device",
-                          "jkl v2",
-                          "XYZ SyncAgent v2",
-                          sync_pb::SyncEnums_DeviceType_TYPE_LINUX,
-                          "device_id");
+  DeviceInfo device_info3(
+      base::GenerateGUID(),
+      "def Device", "jkl v2", "XYZ SyncAgent v2",
+      sync_pb::SyncEnums_DeviceType_TYPE_LINUX);
 
   devices.push_back(&device_info3);
 
@@ -138,8 +132,7 @@
                         device_info.client_name(),
                         device_info.chrome_version(),
                         device_info.sync_user_agent(),
-                        device_info.device_type(),
-                        device_info.signin_scoped_device_id());
+                        device_info.device_type());
 }
 
 std::string GetPublicId(const base::DictionaryValue* dictionary) {
@@ -175,19 +168,15 @@
       static_cast<ProfileSyncServiceMockForExtensionTests*>(
           ProfileSyncServiceFactory::GetForProfile(profile()));
 
-  DeviceInfo device_info1(base::GenerateGUID(),
-                          "abc Device",
-                          "XYZ v1",
-                          "XYZ SyncAgent v1",
-                          sync_pb::SyncEnums_DeviceType_TYPE_LINUX,
-                          "device_id");
+  DeviceInfo device_info1(
+      base::GenerateGUID(),
+      "abc Device", "XYZ v1", "XYZ SyncAgent v1",
+      sync_pb::SyncEnums_DeviceType_TYPE_LINUX);
 
-  DeviceInfo device_info2(base::GenerateGUID(),
-                          "def Device",
-                          "XYZ v2",
-                          "XYZ SyncAgent v2",
-                          sync_pb::SyncEnums_DeviceType_TYPE_LINUX,
-                          "device_id");
+  DeviceInfo device_info2(
+      base::GenerateGUID(),
+      "def Device", "XYZ v2", "XYZ SyncAgent v2",
+      sync_pb::SyncEnums_DeviceType_TYPE_LINUX);
 
   std::vector<DeviceInfo*> devices;
   devices.push_back(CreateDeviceInfo(device_info1));