Revert 284234 "Pass signin_scoped_device_id to DeviceInfoSpecifics."

trunk/src/chrome/browser/sync/glue/synced_device_tracker_unittest.cc

 // Copyright (c) 2012 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/message_loop/message_loop.h"
@@ skipping 75 matching lines @@
 // New client scenario: set device info when no previous info existed.
 TEST_F(SyncedDeviceTrackerTest, CreateNewDeviceInfo) {
   ASSERT_FALSE(synced_device_tracker_->ReadLocalDeviceInfo());
 
   ResetObservedChangesCounter();
 
   // Include the non-ASCII character "’" (typographic apostrophe) in the client
   // name to ensure that SyncedDeviceTracker can properly handle non-ASCII
   // characters, which client names can include on some platforms (e.g., Mac
   // and iOS).
-  DeviceInfo write_device_info(user_share()->directory->cache_guid(),
-                               "John’s Device",
-                               "Chromium 3000",
-                               "ChromeSyncAgent 3000",
-                               sync_pb::SyncEnums_DeviceType_TYPE_LINUX,
-                               "device_id");
+  DeviceInfo write_device_info(
+      user_share()->directory->cache_guid(),
+      "John’s Device", "Chromium 3000", "ChromeSyncAgent 3000",
+      sync_pb::SyncEnums_DeviceType_TYPE_LINUX);
   WriteLocalDeviceInfo(write_device_info);
 
   scoped_ptr<DeviceInfo> read_device_info(
       synced_device_tracker_->ReadLocalDeviceInfo());
   ASSERT_TRUE(read_device_info);
   EXPECT_TRUE(write_device_info.Equals(*read_device_info.get()));
 
   EXPECT_EQ(1, GetObservedChangesCounter());
 }
 
 // Restart scenario: update existing device info with identical data.
 TEST_F(SyncedDeviceTrackerTest, DontModifyExistingDeviceInfo) {
   // For writing.
-  DeviceInfo device_info(user_share()->directory->cache_guid(),
-                         "John’s Device",
-                         "XYZ v1",
-                         "XYZ SyncAgent v1",
-                         sync_pb::SyncEnums_DeviceType_TYPE_LINUX,
-                         "device_id");
+  DeviceInfo device_info(
+      user_share()->directory->cache_guid(),
+      "John’s Device", "XYZ v1", "XYZ SyncAgent v1",
+      sync_pb::SyncEnums_DeviceType_TYPE_LINUX);
   WriteLocalDeviceInfo(device_info);
 
   // First read.
   scoped_ptr<DeviceInfo> old_device_info(
       synced_device_tracker_->ReadLocalDeviceInfo());
   ASSERT_TRUE(old_device_info);
 
   ResetObservedChangesCounter();
 
   // Overwrite the device info with the same data as before.
   WriteLocalDeviceInfo(device_info);
 
   // Ensure that this didn't count as a change worth syncing.
   EXPECT_EQ(0, GetObservedChangesCounter());
 
   // Second read.
   scoped_ptr<DeviceInfo> new_device_info(
       synced_device_tracker_->ReadLocalDeviceInfo());
   ASSERT_TRUE(new_device_info);
   EXPECT_TRUE(old_device_info->Equals(*new_device_info.get()));
 }
 
 // Upgrade scenario: update existing device info with new version.
 TEST_F(SyncedDeviceTrackerTest, UpdateExistingDeviceInfo) {
   // Write v1 device info.
-  DeviceInfo device_info_v1(user_share()->directory->cache_guid(),
-                            "John’s Device",
-                            "XYZ v1",
-                            "XYZ SyncAgent v1",
-                            sync_pb::SyncEnums_DeviceType_TYPE_LINUX,
-                            "device_id1");
+  DeviceInfo device_info_v1(
+      user_share()->directory->cache_guid(),
+      "John’s Device", "XYZ v1", "XYZ SyncAgent v1",
+      sync_pb::SyncEnums_DeviceType_TYPE_LINUX);
   WriteLocalDeviceInfo(device_info_v1);
 
   ResetObservedChangesCounter();
 
   // Write upgraded device info.
-  DeviceInfo device_info_v2(user_share()->directory->cache_guid(),
-                            "John’s Device",
-                            "XYZ v2",
-                            "XYZ SyncAgent v2",
-                            sync_pb::SyncEnums_DeviceType_TYPE_LINUX,
-                            "device_id2");
+  DeviceInfo device_info_v2(
+      user_share()->directory->cache_guid(),
+      "John’s Device", "XYZ v2", "XYZ SyncAgent v2",
+      sync_pb::SyncEnums_DeviceType_TYPE_LINUX);
   WriteLocalDeviceInfo(device_info_v2);
 
   // Verify result.
   scoped_ptr<DeviceInfo> result_device_info(
       synced_device_tracker_->ReadLocalDeviceInfo());
   ASSERT_TRUE(result_device_info);
 
   EXPECT_TRUE(result_device_info->Equals(device_info_v2));
 
   // The update write should have sent a nudge.
   EXPECT_EQ(1, GetObservedChangesCounter());
 }
 
 // Test retrieving DeviceInfos for all the syncing devices.
 TEST_F(SyncedDeviceTrackerTest, GetAllDeviceInfo) {
-  DeviceInfo device_info1(base::GenerateGUID(),
-                          "abc Device",
-                          "XYZ v1",
-                          "XYZ SyncAgent v1",
-                          sync_pb::SyncEnums_DeviceType_TYPE_LINUX,
-                          "device_id1");
+  DeviceInfo device_info1(
+      base::GenerateGUID(),
+      "abc Device", "XYZ v1", "XYZ SyncAgent v1",
+      sync_pb::SyncEnums_DeviceType_TYPE_LINUX);
 
   std::string guid1 = base::GenerateGUID();
 
-  DeviceInfo device_info2(base::GenerateGUID(),
-                          "def Device",
-                          "XYZ v2",
-                          "XYZ SyncAgent v2",
-                          sync_pb::SyncEnums_DeviceType_TYPE_LINUX,
-                          "device_id2");
+  DeviceInfo device_info2(
+      base::GenerateGUID(),
+      "def Device", "XYZ v2", "XYZ SyncAgent v2",
+      sync_pb::SyncEnums_DeviceType_TYPE_LINUX);
 
   std::string guid2 = base::GenerateGUID();
 
   WriteDeviceInfo(device_info1);
   WriteDeviceInfo(device_info2);
 
   ScopedVector<DeviceInfo> device_info;
   synced_device_tracker_->GetAllSyncedDeviceInfo(&device_info);
 
   EXPECT_EQ(device_info.size(), 2U);
   EXPECT_TRUE(device_info[0]->Equals(device_info1));
   EXPECT_TRUE(device_info[1]->Equals(device_info2));
 }
 
 TEST_F(SyncedDeviceTrackerTest, DeviceBackupTime) {
-  DeviceInfo device_info(user_share()->directory->cache_guid(),
-                         "John’s Device",
-                         "XYZ v1",
-                         "XYZ SyncAgent v1",
-                         sync_pb::SyncEnums_DeviceType_TYPE_LINUX,
-                         "device_id");
+  DeviceInfo device_info(
+      user_share()->directory->cache_guid(),
+      "John’s Device", "XYZ v1", "XYZ SyncAgent v1",
+      sync_pb::SyncEnums_DeviceType_TYPE_LINUX);
   const base::Time test_backup_time =
       base::Time::UnixEpoch() + base::TimeDelta::FromDays(10000);
 
   WriteLocalDeviceInfo(device_info);
   synced_device_tracker_->UpdateLocalDeviceBackupTime(test_backup_time);
 
   // Verify read of device info and backup time.
   EXPECT_EQ(test_backup_time,
             synced_device_tracker_->GetLocalDeviceBackupTime());
   scoped_ptr<DeviceInfo> device_info_out(
       synced_device_tracker_->ReadLocalDeviceInfo());
   ASSERT_TRUE(device_info_out);
   EXPECT_TRUE(device_info.Equals(*device_info_out.get()));
 
   // Verify backup time is not lost after updating device info.
-  DeviceInfo device_info2(user_share()->directory->cache_guid(),
-                          "def Device",
-                          "XYZ v2",
-                          "XYZ SyncAgent v2",
-                          sync_pb::SyncEnums_DeviceType_TYPE_LINUX,
-                          "device_id");
+  DeviceInfo device_info2(
+      user_share()->directory->cache_guid(),
+      "def Device", "XYZ v2", "XYZ SyncAgent v2",
+      sync_pb::SyncEnums_DeviceType_TYPE_LINUX);
   WriteLocalDeviceInfo(device_info2);
   EXPECT_EQ(test_backup_time,
             synced_device_tracker_->GetLocalDeviceBackupTime());
 }
 
 }  // namespace
 
 }  // namespace browser_sync