Add logic to flip Nigori bit to instruct other clients to sync tabs.

chrome/browser/sync/internal_api/sync_manager.cc

 // Copyright (c) 2011 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 "chrome/browser/sync/internal_api/sync_manager.h"
 
 #include <string>
 #include <vector>
 
 #include "base/base64.h"
+#include "base/command_line.h"
 #include "base/json/json_writer.h"
 #include "base/string_number_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/sync/engine/all_status.h"
 #include "chrome/browser/sync/engine/change_reorder_buffer.h"
 #include "chrome/browser/sync/engine/net/server_connection_manager.h"
 #include "chrome/browser/sync/engine/net/syncapi_server_connection_manager.h"
 #include "chrome/browser/sync/engine/nigori_util.h"
 #include "chrome/browser/sync/engine/syncapi_internal.h"
 #include "chrome/browser/sync/engine/syncer_types.h"
@@ skipping 14 matching lines @@
 #include "chrome/browser/sync/notifier/sync_notifier.h"
 #include "chrome/browser/sync/notifier/sync_notifier_observer.h"
 #include "chrome/browser/sync/protocol/proto_value_conversions.h"
 #include "chrome/browser/sync/syncable/directory_change_delegate.h"
 #include "chrome/browser/sync/syncable/directory_manager.h"
 #include "chrome/browser/sync/syncable/model_type.h"
 #include "chrome/browser/sync/syncable/model_type_payload_map.h"
 #include "chrome/browser/sync/syncable/syncable.h"
 #include "chrome/browser/sync/util/cryptographer.h"
 #include "chrome/browser/sync/weak_handle.h"
+#include "chrome/common/chrome_switches.h"
 #include "net/base/network_change_notifier.h"
 
 using std::string;
 using std::vector;
 
 using base::TimeDelta;
 using browser_sync::AllStatus;
 using browser_sync::Cryptographer;
 using browser_sync::JsArgList;
 using browser_sync::JsBackend;
@@ skipping 174 matching lines @@
   // and the sync DB is open. True if successful, false if something
   // went wrong.
   bool SignIn(const SyncCredentials& credentials);
 
   // Update tokens that we're using in Sync. Email must stay the same.
   void UpdateCredentials(const SyncCredentials& credentials);
 
   // Called when the user disables or enables a sync type.
   void UpdateEnabledTypes();
 
+  // Conditionally sets the flag in the Nigori node which instructs other
+  // clients to start syncing tabs.
+  void MaybeSetSyncTabsInNigoriNode(const syncable::ModelTypeSet enabled_types);
+
   // Tell the sync engine to start the syncing process.
   void StartSyncingNormally();
 
   // Whether or not the Nigori node is encrypted using an explicit passphrase.
   bool IsUsingExplicitPassphrase();
 
   // Update the Cryptographer from the current nigori node.
   // Note: opens a transaction and can trigger an ON_PASSPHRASE_REQUIRED, so
   // should only be called after syncapi is fully initialized.
   // Returns true if cryptographer is ready, false otherwise.
@@ skipping 401 matching lines @@
 }
 
 void SyncManager::UpdateCredentials(const SyncCredentials& credentials) {
   data_->UpdateCredentials(credentials);
 }
 
 void SyncManager::UpdateEnabledTypes() {
   data_->UpdateEnabledTypes();
 }
 
+void SyncManager::MaybeSetSyncTabsInNigoriNode(
+    const syncable::ModelTypeSet enabled_types) {
+  data_->MaybeSetSyncTabsInNigoriNode(enabled_types);
+}
+
 bool SyncManager::InitialSyncEndedForAllEnabledTypes() {
   return data_->InitialSyncEndedForAllEnabledTypes();
 }
 
 void SyncManager::StartSyncingNormally() {
   data_->StartSyncingNormally();
 }
 
 void SyncManager::SetPassphrase(const std::string& passphrase,
      bool is_explicit) {
@@ skipping 266 matching lines @@
 void SyncManager::SyncInternal::UpdateEnabledTypes() {
   DCHECK(thread_checker_.CalledOnValidThread());
   ModelSafeRoutingInfo routes;
   registrar_->GetModelSafeRoutingInfo(&routes);
   syncable::ModelTypeSet enabled_types;
   for (ModelSafeRoutingInfo::const_iterator it = routes.begin();
        it != routes.end(); ++it) {
     enabled_types.insert(it->first);
   }
   sync_notifier_->UpdateEnabledTypes(enabled_types);
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kEnableSyncSessionsForOtherClients)) {
+    MaybeSetSyncTabsInNigoriNode(enabled_types);
+  }
+}
+
+void SyncManager::SyncInternal::MaybeSetSyncTabsInNigoriNode(
+    const syncable::ModelTypeSet enabled_types) {
+  // The initialized_ check is to ensure that we don't CHECK in GetUserShare
+  // when this is called on start-up. It's ok to ignore that case, since
+  // presumably this would've run when the user originally enabled sessions.
+  if (initialized_ && enabled_types.count(syncable::SESSIONS) > 0) {
+    WriteTransaction trans(FROM_HERE, GetUserShare());
+    WriteNode node(&trans);
+    if (!node.InitByTagLookup(kNigoriTag)) {
+      NOTREACHED() << "Unable to set 'sync_tabs' bit because Nigori node not "
+                   << "found.";
+      return;
+    }
+
+    sync_pb::NigoriSpecifics specifics(node.GetNigoriSpecifics());
+    specifics.set_sync_tabs(true);
+    node.SetNigoriSpecifics(specifics);
+  }
 }
 
 void SyncManager::SyncInternal::RaiseAuthNeededEvent() {
   ObserverList<SyncManager::Observer> temp_obs_list;
   CopyObservers(&temp_obs_list);
   FOR_EACH_OBSERVER(SyncManager::Observer, temp_obs_list,
       OnAuthError(AuthError(AuthError::INVALID_GAIA_CREDENTIALS)));
 }
 
 void SyncManager::SyncInternal::SetPassphrase(
@@ skipping 1102 matching lines @@
 
   for (syncable::ModelTypeSet::const_iterator i = types.begin();
        i != types.end(); ++i) {
     if (!lookup->initial_sync_ended_for_type(*i))
       return false;
   }
   return true;
 }
 
 }  // namespace sync_api