NOT FOR COMMIT: Add DeviceInfo type and ChangeProcessor

sync/internal_api/sync_manager_impl.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 "sync/internal_api/sync_manager_impl.h"
 
 #include <string>
 
 #include "base/base64.h"
 #include "base/bind.h"
@@ skipping 29 matching lines @@
 #include "sync/js/js_event_handler.h"
 #include "sync/js/js_reply_handler.h"
 #include "sync/notifier/invalidation_util.h"
 #include "sync/notifier/invalidator.h"
 #include "sync/protocol/proto_value_conversions.h"
 #include "sync/protocol/sync.pb.h"
 #include "sync/syncable/directory.h"
 #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;
 
 namespace syncer {
 
 using sessions::SyncSessionContext;
 using syncable::ImmutableWriteTransactionInfo;
 using syncable::SPECIFICS;
 
@@ skipping 275 matching lines @@
     retry_task.Run();
 
 }
 
 void SyncManagerImpl::Init(
     const FilePath& database_location,
     const WeakHandle<JsEventHandler>& event_handler,
     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,
     SyncManager::ChangeDelegate* change_delegate,
     const SyncCredentials& credentials,
     scoped_ptr<Invalidator> invalidator,
     const std::string& restored_key_for_bootstrapping,
     const std::string& restored_keystore_key_for_bootstrapping,
     scoped_ptr<InternalComponentsFactory> internal_components_factory,
     Encryptor* encryptor,
     UnrecoverableErrorHandler* unrecoverable_error_handler,
     ReportUnrecoverableErrorFunction report_unrecoverable_error_function) {
   CHECK(!initialized_);
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(post_factory.get());
   DCHECK(!credentials.email.empty());
   DCHECK(!credentials.sync_token.empty());
   DVLOG(1) << "SyncManager starting Init...";
 
   weak_handle_this_ = MakeWeakHandle(weak_ptr_factory_.GetWeakPtr());
 
-  blocking_task_runner_ = blocking_task_runner;
-
   change_delegate_ = change_delegate;
 
   invalidator_ = invalidator.Pass();
   invalidator_->RegisterHandler(this);
 
   AddObserver(&js_sync_manager_observer_);
   SetJsEventHandler(event_handler);
 
   AddObserver(&debug_info_event_listener_);
 
@@ skipping 86 matching lines @@
   observing_ip_address_changes_ = true;
 
   UpdateCredentials(credentials);
 
   FOR_EACH_OBSERVER(SyncManager::Observer, observers_,
                     OnInitializationComplete(
                         MakeWeakHandle(weak_ptr_factory_.GetWeakPtr()),
                         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) {
   // Does nothing.
 }
 
 void SyncManagerImpl::OnPassphraseAccepted() {
   // Does nothing.
 }
 
@@ skipping 822 matching lines @@
 int SyncManagerImpl::GetDefaultNudgeDelay() {
   return kDefaultNudgeDelayMilliseconds;
 }
 
 // static.
 int SyncManagerImpl::GetPreferencesNudgeDelay() {
   return kPreferencesNudgeDelayMilliseconds;
 }
 
 }  // namespace syncer