Revert 284234 "Pass signin_scoped_device_id to DeviceInfoSpecifics."

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

Index: trunk/src/chrome/browser/sync/glue/device_info.cc
===================================================================
--- trunk/src/chrome/browser/sync/glue/device_info.cc	(revision 284241)
+++ trunk/src/chrome/browser/sync/glue/device_info.cc	(working copy)
@@ -39,7 +39,7 @@
     default:
       NOTREACHED();
       return "unknown";
-  }
+  };
 }
 
 }  // namespace
@@ -48,14 +48,12 @@
                        const std::string& client_name,
                        const std::string& chrome_version,
                        const std::string& sync_user_agent,
-                       const sync_pb::SyncEnums::DeviceType device_type,
-                       const std::string& signin_scoped_device_id)
+                       const sync_pb::SyncEnums::DeviceType device_type)
     : guid_(guid),
       client_name_(client_name),
       chrome_version_(chrome_version),
       sync_user_agent_(sync_user_agent),
-      device_type_(device_type),
-      signin_scoped_device_id_(signin_scoped_device_id) {
+      device_type_(device_type) {
 }
 
 DeviceInfo::~DeviceInfo() { }
@@ -84,10 +82,6 @@
   return device_type_;
 }
 
-const std::string& DeviceInfo::signin_scoped_device_id() const {
-  return signin_scoped_device_id_;
-}
-
 std::string DeviceInfo::GetOSString() const {
   switch (device_type_) {
     case sync_pb::SyncEnums_DeviceType_TYPE_WIN:
@@ -125,12 +119,11 @@
 }
 
 bool DeviceInfo::Equals(const DeviceInfo& other) const {
-  return this->guid() == other.guid() &&
-         this->client_name() == other.client_name() &&
-         this->chrome_version() == other.chrome_version() &&
-         this->sync_user_agent() == other.sync_user_agent() &&
-         this->device_type() == other.device_type() &&
-         this->signin_scoped_device_id() == other.signin_scoped_device_id();
+  return this->guid() == other.guid()
+      && this->client_name() == other.client_name()
+      && this->chrome_version() == other.chrome_version()
+      && this->sync_user_agent() == other.sync_user_agent()
+      && this->device_type() == other.device_type();
 }
 
 // static.
@@ -209,12 +202,11 @@
 // static.
 void DeviceInfo::CreateLocalDeviceInfo(
     const std::string& guid,
-    const std::string& signin_scoped_device_id,
     base::Callback<void(const DeviceInfo& local_info)> callback) {
-  GetClientName(base::Bind(&DeviceInfo::CreateLocalDeviceInfoContinuation,
-                           guid,
-                           signin_scoped_device_id,
-                           callback));
+  GetClientName(
+      base::Bind(&DeviceInfo::CreateLocalDeviceInfoContinuation,
+                 guid,
+                 callback));
 }
 
 // static.
@@ -235,17 +227,16 @@
 // static.
 void DeviceInfo::CreateLocalDeviceInfoContinuation(
     const std::string& guid,
-    const std::string& signin_scoped_device_id,
     base::Callback<void(const DeviceInfo& local_info)> callback,
     const std::string& session_name) {
   chrome::VersionInfo version_info;
 
-  DeviceInfo local_info(guid,
-                        session_name,
-                        version_info.CreateVersionString(),
-                        MakeUserAgentForSyncApi(version_info),
-                        GetLocalDeviceType(),
-                        signin_scoped_device_id);
+  DeviceInfo local_info(
+      guid,
+      session_name,
+      version_info.CreateVersionString(),
+      MakeUserAgentForSyncApi(version_info),
+      GetLocalDeviceType());
 
   callback.Run(local_info);
 }