NOT FOR COMMIT: Add DeviceInfo type and ChangeProcessor

sync/internal_api/sync_manager_impl.cc

Index: sync/internal_api/sync_manager_impl.cc
diff --git a/sync/internal_api/sync_manager_impl.cc b/sync/internal_api/sync_manager_impl.cc
index 0823e713888d7b5ca8388266cbbbef4447b0c003..014755f57113ec3900dbafc39848c5b399ac51c2 100644
--- a/sync/internal_api/sync_manager_impl.cc
+++ b/sync/internal_api/sync_manager_impl.cc
@@ -47,7 +47,6 @@
 #include "sync/syncable/entry.h"
 #include "sync/syncable/in_memory_directory_backing_store.h"
 #include "sync/syncable/on_disk_directory_backing_store.h"
-#include "sync/util/get_session_name.h"
 
 using base::TimeDelta;
 using sync_pb::GetUpdatesCallerInfo;
@@ -343,7 +342,6 @@ void SyncManagerImpl::Init(
     const std::string& sync_server_and_path,
     int port,
     bool use_ssl,
-    const scoped_refptr<base::TaskRunner>& blocking_task_runner,
     scoped_ptr<HttpPostProviderFactory> post_factory,
     const std::vector<ModelSafeWorker*>& workers,
     ExtensionsActivityMonitor* extensions_activity_monitor,
@@ -365,8 +363,6 @@ void SyncManagerImpl::Init(
 
   weak_handle_this_ = MakeWeakHandle(weak_ptr_factory_.GetWeakPtr());
 
-  blocking_task_runner_ = blocking_task_runner;
-
   change_delegate_ = change_delegate;
 
   invalidator_ = invalidator.Pass();
@@ -473,54 +469,6 @@ void SyncManagerImpl::Init(
                         true, InitialSyncEndedTypes()));
 }
 
-void SyncManagerImpl::UpdateSessionNameCallback(
-    const std::string& chrome_version,
-    const std::string& session_name) {
-  WriteTransaction trans(FROM_HERE, GetUserShare());
-  WriteNode node(&trans);
-  // TODO(rlarocque): switch to device info node.
-  if (node.InitByTagLookup(syncer::kNigoriTag) != syncer::BaseNode::INIT_OK) {
-    return;
-  }
-
-  sync_pb::NigoriSpecifics nigori(node.GetNigoriSpecifics());
-  // Add or update device information.
-  bool contains_this_device = false;
-  for (int i = 0; i < nigori.device_information_size(); ++i) {
-    const sync_pb::DeviceInformation& device_information =
-        nigori.device_information(i);
-    if (device_information.cache_guid() == directory()->cache_guid()) {
-      // Update the version number in case it changed due to an update.
-      if (device_information.chrome_version() != chrome_version) {
-        sync_pb::DeviceInformation* mutable_device_information =
-            nigori.mutable_device_information(i);
-        mutable_device_information->set_chrome_version(
-            chrome_version);
-      }
-      contains_this_device = true;
-    }
-  }
-
-  if (!contains_this_device) {
-    sync_pb::DeviceInformation* device_information =
-        nigori.add_device_information();
-    device_information->set_cache_guid(directory()->cache_guid());
-#if defined(OS_CHROMEOS)
-    device_information->set_platform("ChromeOS");
-#elif defined(OS_LINUX)
-    device_information->set_platform("Linux");
-#elif defined(OS_MACOSX)
-    device_information->set_platform("Mac");
-#elif defined(OS_WIN)
-    device_information->set_platform("Windows");
-#endif
-    device_information->set_name(session_name);
-    device_information->set_chrome_version(chrome_version);
-  }
-  node.SetNigoriSpecifics(nigori);
-}
-
-
 void SyncManagerImpl::OnPassphraseRequired(
     PassphraseRequiredReason reason,
     const sync_pb::EncryptedData& pending_keys) {