Revert 284234 "Pass signin_scoped_device_id to DeviceInfoSpecifics."

Compilation error on Win builder.

src\sync\internal_api\public\base\invalidation_util.cc(14) : fatal error C1083: Cannot open include file: 'google/cacheinvalidation/types.pb.h': No such file or directory

> Pass signin_scoped_device_id to DeviceInfoSpecifics.
> 
> I'm adding signin_scoped_device_id to DeviceInfoSpecifics.
> This value is available from SigninClient, the rest of code is to pass
> value from syncBackendHostImpl where SigninClient is availble to
> SyncedDeviceTracker where value is passed to protobuf.
> 
> Also there is small change to how commandline flag is handled.
> 
> BUG=382968
> R=rlarocque@chromium.org
> 
> Review URL: https://codereview.chromium.org/395013002

TBR=pavely@chromium.org

Review URL: https://codereview.chromium.org/398273006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284242 0039d316-1c4b-4281-b951-d872f2087c98

17 files changed, 113 insertions, 203 deletions

diff --git a/chrome/browser/extensions/api/sessions/sessions_apitest.cc b/chrome/browser/extensions/api/sessions/sessions_apitest.cc
index fd2a8d6..cc208d2 100644
--- a/chrome/browser/extensions/api/sessions/sessions_apitest.cc
+++ b/chrome/browser/extensions/api/sessions/sessions_apitest.cc
@@ -148,8 +148,7 @@ void ExtensionSessionsTest::CreateTestProfileSyncService() {
           "machine name",
           "Chromium 10k",
           "Chrome 10k",
-          sync_pb::SyncEnums_DeviceType_TYPE_LINUX,
-          "device_id")));
+          sync_pb::SyncEnums_DeviceType_TYPE_LINUX)));
   ON_CALL(*service, GetLocalSyncCacheGUID()).WillByDefault(
       testing::Return(std::string(kSessionTags[0])));
   EXPECT_CALL(*service, AddObserver(testing::_)).Times(testing::AnyNumber());
diff --git a/chrome/browser/extensions/api/signed_in_devices/id_mapping_helper_unittest.cc b/chrome/browser/extensions/api/signed_in_devices/id_mapping_helper_unittest.cc
index 2464703..b514b4b 100644
--- a/chrome/browser/extensions/api/signed_in_devices/id_mapping_helper_unittest.cc
+++ b/chrome/browser/extensions/api/signed_in_devices/id_mapping_helper_unittest.cc
@@ -31,19 +31,13 @@ bool VerifyDictionary(
 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(),
-                                   "def Device",
-                                   "XYZ v1",
-                                   "XYZ SyncAgent v1",
-                                   sync_pb::SyncEnums_DeviceType_TYPE_LINUX,
-                                   "device_id2"));
+  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));
 
   base::DictionaryValue dictionary;
 
@@ -58,12 +52,9 @@ TEST(IdMappingHelperTest, SetIdsForDevices) {
   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);
 
diff --git a/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api_unittest.cc b/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api_unittest.cc
index f98b954..8b475fb 100644
--- a/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api_unittest.cc
+++ b/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api_unittest.cc
@@ -39,19 +39,15 @@ TEST(SignedInDevicesAPITest, GetSignedInDevices) {
   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_info2(base::GenerateGUID(),
-                          "def Device",
-                          "XYZ v2",
-                          "XYZ SyncAgent v2",
-                          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);
 
   std::vector<DeviceInfo*> devices;
   devices.push_back(&device_info1);
@@ -78,12 +74,10 @@ TEST(SignedInDevicesAPITest, GetSignedInDevices) {
 
   // 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 @@ DeviceInfo* CreateDeviceInfo(const DeviceInfo& device_info) {
                         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 @@ TEST_F(ExtensionSignedInDevicesTest, GetAll) {
       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_info2(base::GenerateGUID(),
-                          "def Device",
-                          "XYZ v2",
-                          "XYZ SyncAgent v2",
-                          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);
 
   std::vector<DeviceInfo*> devices;
   devices.push_back(CreateDeviceInfo(device_info1));
diff --git a/chrome/browser/sync/glue/device_info.cc b/chrome/browser/sync/glue/device_info.cc
index f3ea360..76033de 100644
--- a/chrome/browser/sync/glue/device_info.cc
+++ b/chrome/browser/sync/glue/device_info.cc
@@ -39,7 +39,7 @@ std::string ChannelToString(chrome::VersionInfo::Channel channel) {
     default:
       NOTREACHED();
       return "unknown";
-  }
+  };
 }
 
 }  // namespace
@@ -48,14 +48,12 @@ DeviceInfo::DeviceInfo(const std::string& guid,
                        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 @@ sync_pb::SyncEnums::DeviceType DeviceInfo::device_type() const {
   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 @@ std::string DeviceInfo::GetDeviceTypeString() const {
 }
 
 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 @@ void DeviceInfo::set_public_id(std::string id) {
 // 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 @@ void DeviceInfo::GetClientNameContinuation(
 // 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);
 }
diff --git a/chrome/browser/sync/glue/device_info.h b/chrome/browser/sync/glue/device_info.h
index a46e650..d94a9bc 100644
--- a/chrome/browser/sync/glue/device_info.h
+++ b/chrome/browser/sync/glue/device_info.h
@@ -28,8 +28,7 @@ class DeviceInfo {
              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);
   ~DeviceInfo();
 
   // Sync specific unique identifier for the device. Note if a device
@@ -55,10 +54,6 @@ class DeviceInfo {
   // Device Type.
   sync_pb::SyncEnums::DeviceType device_type() const;
 
-  // Device_id that is stable until user signs out. This device_id is used for
-  // annotating login scoped refresh token.
-  const std::string& signin_scoped_device_id() const;
-
   // Gets the OS in string form.
   std::string GetOSString() const;
 
@@ -84,7 +79,6 @@ class DeviceInfo {
   // it as parameter to the callback.
   static void CreateLocalDeviceInfo(
       const std::string& guid,
-      const std::string& signin_scoped_device_id,
       base::Callback<void(const DeviceInfo& local_info)> callback);
 
   // Gets the local device name and passes it as a parameter to callback.
@@ -104,7 +98,6 @@ class DeviceInfo {
 
   static void 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);
 
@@ -118,8 +111,6 @@ class DeviceInfo {
 
   const sync_pb::SyncEnums::DeviceType device_type_;
 
-  std::string signin_scoped_device_id_;
-
   // Exposing |guid| would lead to a stable unique id for a device which
   // can potentially be used for tracking. Public ids are privacy safe
   // ids in that the same device will have different id for different apps
diff --git a/chrome/browser/sync/glue/sync_backend_host_core.cc b/chrome/browser/sync/glue/sync_backend_host_core.cc
index 0243dd0..a32dad1 100644
--- a/chrome/browser/sync/glue/sync_backend_host_core.cc
+++ b/chrome/browser/sync/glue/sync_backend_host_core.cc
@@ -70,8 +70,7 @@ DoInitializeOptions::DoInitializeOptions(
     scoped_ptr<syncer::InternalComponentsFactory> internal_components_factory,
     scoped_ptr<syncer::UnrecoverableErrorHandler> unrecoverable_error_handler,
     syncer::ReportUnrecoverableErrorFunction
-        report_unrecoverable_error_function,
-    const std::string& signin_scoped_device_id)
+        report_unrecoverable_error_function)
     : sync_loop(sync_loop),
       registrar(registrar),
       routing_info(routing_info),
@@ -89,8 +88,8 @@ DoInitializeOptions::DoInitializeOptions(
           restored_keystore_key_for_bootstrapping),
       internal_components_factory(internal_components_factory.Pass()),
       unrecoverable_error_handler(unrecoverable_error_handler.Pass()),
-      report_unrecoverable_error_function(report_unrecoverable_error_function),
-      signin_scoped_device_id(signin_scoped_device_id) {
+      report_unrecoverable_error_function(
+          report_unrecoverable_error_function) {
 }
 
 DoInitializeOptions::~DoInitializeOptions() {}
@@ -403,8 +402,6 @@ void SyncBackendHostCore::DoInitialize(
   sync_loop_ = options->sync_loop;
   DCHECK(sync_loop_);
 
-  signin_scoped_device_id_ = options->signin_scoped_device_id;
-
   // Finish initializing the HttpBridgeFactory.  We do this here because
   // building the user agent may block on some platforms.
   chrome::VersionInfo version_info;
@@ -509,7 +506,6 @@ void SyncBackendHostCore::DoInitialProcessControlTypes() {
       new SyncedDeviceTracker(sync_manager_->GetUserShare(),
                               sync_manager_->cache_guid()));
   synced_device_tracker_->InitLocalDeviceInfo(
-      signin_scoped_device_id_,
       base::Bind(&SyncBackendHostCore::DoFinishInitialProcessControlTypes,
                  weak_ptr_factory_.GetWeakPtr()));
 }
diff --git a/chrome/browser/sync/glue/sync_backend_host_core.h b/chrome/browser/sync/glue/sync_backend_host_core.h
index 9b1ba67..635a331 100644
--- a/chrome/browser/sync/glue/sync_backend_host_core.h
+++ b/chrome/browser/sync/glue/sync_backend_host_core.h
@@ -36,11 +36,12 @@ struct DoInitializeOptions {
       bool delete_sync_data_folder,
       const std::string& restored_key_for_bootstrapping,
       const std::string& restored_keystore_key_for_bootstrapping,
-      scoped_ptr<syncer::InternalComponentsFactory> internal_components_factory,
-      scoped_ptr<syncer::UnrecoverableErrorHandler> unrecoverable_error_handler,
+      scoped_ptr<syncer::InternalComponentsFactory>
+          internal_components_factory,
+      scoped_ptr<syncer::UnrecoverableErrorHandler>
+          unrecoverable_error_handler,
       syncer::ReportUnrecoverableErrorFunction
-          report_unrecoverable_error_function,
-      const std::string& signin_scoped_device_id);
+          report_unrecoverable_error_function);
   ~DoInitializeOptions();
 
   base::MessageLoop* sync_loop;
@@ -63,7 +64,6 @@ struct DoInitializeOptions {
   scoped_ptr<syncer::UnrecoverableErrorHandler> unrecoverable_error_handler;
   syncer::ReportUnrecoverableErrorFunction
       report_unrecoverable_error_function;
-  std::string signin_scoped_device_id;
 };
 
 // Helper struct to handle currying params to
@@ -322,10 +322,6 @@ class SyncBackendHostCore
   // Set when the forwarding of per-type debug counters is enabled.
   bool forward_type_info_;
 
-  // Obtained from SigninClient::GetSigninScopedDeviceId(). Stored here just to
-  // pass from SyncBackendHostImpl to SyncedDeviceTracker.
-  std::string signin_scoped_device_id_;
-
   base::WeakPtrFactory<SyncBackendHostCore> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncBackendHostCore);
diff --git a/chrome/browser/sync/glue/sync_backend_host_impl.cc b/chrome/browser/sync/glue/sync_backend_host_impl.cc
index 87d294e..59d0c3c 100644
--- a/chrome/browser/sync/glue/sync_backend_host_impl.cc
+++ b/chrome/browser/sync/glue/sync_backend_host_impl.cc
@@ -9,14 +9,12 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/signin/chrome_signin_client_factory.h"
 #include "chrome/browser/sync/glue/sync_backend_host_core.h"
 #include "chrome/browser/sync/glue/sync_backend_registrar.h"
 #include "chrome/common/chrome_switches.h"
 #include "components/invalidation/invalidation_service.h"
 #include "components/invalidation/object_id_invalidation_map.h"
 #include "components/network_time/network_time_tracker.h"
-#include "components/signin/core/browser/signin_client.h"
 #include "components/sync_driver/sync_frontend.h"
 #include "components/sync_driver/sync_prefs.h"
 #include "content/public/browser/browser_thread.h"
@@ -134,12 +132,6 @@ void SyncBackendHostImpl::Initialize(
         InternalComponentsFactory::FORCE_ENABLE_PRE_COMMIT_UPDATE_AVOIDANCE;
   }
 
-  SigninClient* signin_client =
-      ChromeSigninClientFactory::GetForProfile(profile_);
-  DCHECK(signin_client);
-  std::string signin_scoped_device_id =
-      signin_client->GetSigninScopedDeviceId();
-
   scoped_ptr<DoInitializeOptions> init_opts(new DoInitializeOptions(
       registrar_->sync_thread()->message_loop(),
       registrar_.get(),
@@ -161,8 +153,7 @@ void SyncBackendHostImpl::Initialize(
       scoped_ptr<InternalComponentsFactory>(
           new syncer::InternalComponentsFactoryImpl(factory_switches)).Pass(),
       unrecoverable_error_handler.Pass(),
-      report_unrecoverable_error_function,
-      signin_scoped_device_id));
+      report_unrecoverable_error_function));
   InitCore(init_opts.Pass());
 }
 
diff --git a/chrome/browser/sync/glue/synced_device_tracker.cc b/chrome/browser/sync/glue/synced_device_tracker.cc
index 73e8cbb..e77463e 100644
--- a/chrome/browser/sync/glue/synced_device_tracker.cc
+++ b/chrome/browser/sync/glue/synced_device_tracker.cc
@@ -68,13 +68,12 @@ scoped_ptr<DeviceInfo> SyncedDeviceTracker::ReadLocalDeviceInfo(
   }
 
   const sync_pb::DeviceInfoSpecifics& specifics = node.GetDeviceInfoSpecifics();
-  return scoped_ptr<DeviceInfo>(
+  return scoped_ptr<DeviceInfo> (
       new DeviceInfo(specifics.cache_guid(),
                      specifics.client_name(),
                      specifics.chrome_version(),
                      specifics.sync_user_agent(),
-                     specifics.device_type(),
-                     specifics.signin_scoped_device_id()));
+                     specifics.device_type()));
 }
 
 scoped_ptr<DeviceInfo> SyncedDeviceTracker::ReadDeviceInfo(
@@ -88,13 +87,12 @@ scoped_ptr<DeviceInfo> SyncedDeviceTracker::ReadDeviceInfo(
   }
 
   const sync_pb::DeviceInfoSpecifics& specifics = node.GetDeviceInfoSpecifics();
-  return scoped_ptr<DeviceInfo>(
+  return scoped_ptr<DeviceInfo> (
       new DeviceInfo(specifics.cache_guid(),
                      specifics.client_name(),
                      specifics.chrome_version(),
                      specifics.sync_user_agent(),
-                     specifics.device_type(),
-                     specifics.signin_scoped_device_id()));
+                     specifics.device_type()));
 }
 
 void SyncedDeviceTracker::GetAllSyncedDeviceInfo(
@@ -125,12 +123,12 @@ void SyncedDeviceTracker::GetAllSyncedDeviceInfo(
 
     const sync_pb::DeviceInfoSpecifics& specifics =
         node.GetDeviceInfoSpecifics();
-    device_info->push_back(new DeviceInfo(specifics.cache_guid(),
-                                          specifics.client_name(),
-                                          specifics.chrome_version(),
-                                          specifics.sync_user_agent(),
-                                          specifics.device_type(),
-                                          specifics.signin_scoped_device_id()));
+    device_info->push_back(
+        new DeviceInfo(specifics.cache_guid(),
+                       specifics.client_name(),
+                       specifics.chrome_version(),
+                       specifics.sync_user_agent(),
+                       specifics.device_type()));
   }
 }
 
@@ -146,15 +144,11 @@ void SyncedDeviceTracker::RemoveObserver(Observer* observer) {
   observers_->RemoveObserver(observer);
 }
 
-void SyncedDeviceTracker::InitLocalDeviceInfo(
-    const std::string& signin_scoped_device_id,
-    const base::Closure& callback) {
+void SyncedDeviceTracker::InitLocalDeviceInfo(const base::Closure& callback) {
   DeviceInfo::CreateLocalDeviceInfo(
       cache_guid_,
-      signin_scoped_device_id,
       base::Bind(&SyncedDeviceTracker::InitLocalDeviceInfoContinuation,
-                 weak_factory_.GetWeakPtr(),
-                 callback));
+                 weak_factory_.GetWeakPtr(), callback));
 }
 
 void SyncedDeviceTracker::InitLocalDeviceInfoContinuation(
@@ -179,7 +173,6 @@ void SyncedDeviceTracker::WriteDeviceInfo(const DeviceInfo& info,
   specifics.set_chrome_version(info.chrome_version());
   specifics.set_sync_user_agent(info.sync_user_agent());
   specifics.set_device_type(info.device_type());
-  specifics.set_signin_scoped_device_id(info.signin_scoped_device_id());
 
   if (node.InitByClientTagLookup(syncer::DEVICE_INFO, tag) ==
       syncer::BaseNode::INIT_OK) {
diff --git a/chrome/browser/sync/glue/synced_device_tracker.h b/chrome/browser/sync/glue/synced_device_tracker.h
index 6c056f0..1bc2d66 100644
--- a/chrome/browser/sync/glue/synced_device_tracker.h
+++ b/chrome/browser/sync/glue/synced_device_tracker.h
@@ -47,8 +47,7 @@ class SyncedDeviceTracker : public ChangeProcessor {
   virtual scoped_ptr<DeviceInfo> ReadLocalDeviceInfo(
       const syncer::BaseTransaction &trans) const;
   virtual scoped_ptr<DeviceInfo> ReadLocalDeviceInfo() const;
-  virtual void InitLocalDeviceInfo(const std::string& signin_scoped_device_id,
-                                   const base::Closure& callback);
+  virtual void InitLocalDeviceInfo(const base::Closure& callback);
   virtual scoped_ptr<DeviceInfo> ReadDeviceInfo(
       const std::string& client_id) const;
   virtual void GetAllSyncedDeviceInfo(
diff --git a/chrome/browser/sync/glue/synced_device_tracker_unittest.cc b/chrome/browser/sync/glue/synced_device_tracker_unittest.cc
index 15161e3..267d047 100644
--- a/chrome/browser/sync/glue/synced_device_tracker_unittest.cc
+++ b/chrome/browser/sync/glue/synced_device_tracker_unittest.cc
@@ -93,12 +93,10 @@ TEST_F(SyncedDeviceTrackerTest, CreateNewDeviceInfo) {
   // 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(
@@ -112,12 +110,10 @@ TEST_F(SyncedDeviceTrackerTest, CreateNewDeviceInfo) {
 // 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.
@@ -143,23 +139,19 @@ TEST_F(SyncedDeviceTrackerTest, DontModifyExistingDeviceInfo) {
 // 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.
@@ -175,21 +167,17 @@ TEST_F(SyncedDeviceTrackerTest, UpdateExistingDeviceInfo) {
 
 // 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();
 
@@ -205,12 +193,10 @@ TEST_F(SyncedDeviceTrackerTest, GetAllDeviceInfo) {
 }
 
 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);
 
@@ -226,12 +212,10 @@ TEST_F(SyncedDeviceTrackerTest, DeviceBackupTime) {
   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());
diff --git a/chrome/browser/sync/profile_sync_service_factory.cc b/chrome/browser/sync/profile_sync_service_factory.cc
index 95c911a..fe1020f 100644
--- a/chrome/browser/sync/profile_sync_service_factory.cc
+++ b/chrome/browser/sync/profile_sync_service_factory.cc
@@ -19,7 +19,6 @@
 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
 #include "chrome/browser/sessions/tab_restore_service_factory.h"
 #include "chrome/browser/signin/about_signin_internals_factory.h"
-#include "chrome/browser/signin/chrome_signin_client_factory.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/sync/profile_sync_components_factory_impl.h"
@@ -66,7 +65,6 @@ ProfileSyncServiceFactory::ProfileSyncServiceFactory()
   DependsOn(AboutSigninInternalsFactory::GetInstance());
   DependsOn(autofill::PersonalDataManagerFactory::GetInstance());
   DependsOn(BookmarkModelFactory::GetInstance());
-  DependsOn(ChromeSigninClientFactory::GetInstance());
   DependsOn(GlobalErrorServiceFactory::GetInstance());
   DependsOn(HistoryServiceFactory::GetInstance());
   DependsOn(invalidation::ProfileInvalidationProviderFactory::GetInstance());
diff --git a/chrome/browser/sync/sessions/sessions_sync_manager_unittest.cc b/chrome/browser/sync/sessions/sessions_sync_manager_unittest.cc
index e06ad8c..213fb74 100644
--- a/chrome/browser/sync/sessions/sessions_sync_manager_unittest.cc
+++ b/chrome/browser/sync/sessions/sessions_sync_manager_unittest.cc
@@ -255,8 +255,7 @@ class SessionsSyncManagerTest
                        "Wayne Gretzky's Hacking Box",
                        "Chromium 10k",
                        "Chrome 10k",
-                       sync_pb::SyncEnums_DeviceType_TYPE_LINUX,
-                       "device_id"));
+                       sync_pb::SyncEnums_DeviceType_TYPE_LINUX));
   }
 
   virtual std::string GetLocalSyncCacheGUID() const OVERRIDE {
diff --git a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm
index 3b94945..774b559 100644
--- a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm
@@ -88,8 +88,7 @@ class WrenchMenuControllerTest
                        "Test Machine",
                        "Chromium 10k",
                        "Chrome 10k",
-                       sync_pb::SyncEnums_DeviceType_TYPE_LINUX,
-                       "device_id"));
+                       sync_pb::SyncEnums_DeviceType_TYPE_LINUX));
   }
 
   virtual std::string GetLocalSyncCacheGUID() const OVERRIDE {
diff --git a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc
index 6875d40..56be452 100644
--- a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc
+++ b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc
@@ -154,11 +154,10 @@ class RecentTabsSubMenuModelTest
       const OVERRIDE {
     return scoped_ptr<browser_sync::DeviceInfo>(
         new browser_sync::DeviceInfo(GetLocalSyncCacheGUID(),
-                                     "Test Machine",
-                                     "Chromium 10k",
-                                     "Chrome 10k",
-                                     sync_pb::SyncEnums_DeviceType_TYPE_LINUX,
-                                     "device_id"));
+                       "Test Machine",
+                       "Chromium 10k",
+                       "Chrome 10k",
+                       sync_pb::SyncEnums_DeviceType_TYPE_LINUX));
   }
 
   virtual std::string GetLocalSyncCacheGUID() const OVERRIDE {
diff --git a/sync/protocol/device_info_specifics.proto b/sync/protocol/device_info_specifics.proto
index 99af88b..f87b361 100644
--- a/sync/protocol/device_info_specifics.proto
+++ b/sync/protocol/device_info_specifics.proto
@@ -38,8 +38,4 @@ message DeviceInfoSpecifics {
   // Last time when pre-sync data on the device was saved. The device can be
   // restored to state back to this time. In millisecond since UNIX epoch.
   optional int64 backup_timestamp = 6;
-
-  // Device_id that is stable until user signs out. This device_id is used for
-  // annotating login scoped refresh token.
-  optional string signin_scoped_device_id = 7;
 }
diff --git a/sync/protocol/proto_value_conversions.cc b/sync/protocol/proto_value_conversions.cc
index 62b611f..740eae4 100644
--- a/sync/protocol/proto_value_conversions.cc
+++ b/sync/protocol/proto_value_conversions.cc
@@ -499,7 +499,6 @@ base::DictionaryValue* DeviceInfoSpecificsToValue(
   SET_STR(sync_user_agent);
   SET_STR(chrome_version);
   SET_TIME_STR(backup_timestamp);
-  SET_STR(signin_scoped_device_id);
   return value;
 }