[Sync] Refactor sync configuration logic.

sync/internal_api/sync_manager.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.h"
 
 #include <string>
 
 #include "base/base64.h"
 #include "base/bind.h"
@@ skipping 823 matching lines @@
 
 bool SyncManager::EncryptEverythingEnabledForTest() const {
   ReadTransaction trans(FROM_HERE, GetUserShare());
   return trans.GetCryptographer()->encrypt_everything();
 }
 
 bool SyncManager::IsUsingExplicitPassphrase() {
   return data_ && data_->IsUsingExplicitPassphrase();
 }
 
-void SyncManager::RequestCleanupDisabledTypes(
-    const browser_sync::ModelSafeRoutingInfo& routing_info) {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  if (data_->scheduler()) {
-    data_->session_context()->set_routing_info(routing_info);
-    data_->scheduler()->ScheduleCleanupDisabledTypes();
-  }
-}
-
 void SyncManager::RequestClearServerData() {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (data_->scheduler())
     data_->scheduler()->ScheduleClearUserData();
 }
 
-void SyncManager::RequestConfig(
-    const browser_sync::ModelSafeRoutingInfo& routing_info,
-    const ModelTypeSet& types, ConfigureReason reason) {
+void SyncManager::ConfigureSyncer(
+    ConfigureReason reason,
+    const syncable::ModelTypeSet& types_to_config,
+    const browser_sync::ModelSafeRoutingInfo& new_routing_info,
+    const base::Closure& ready_task,
+    const base::Closure& retry_task) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  if (!data_->scheduler()) {
-    LOG(INFO)
-        << "SyncManager::RequestConfig: bailing out because scheduler is "
-        << "null";
-    return;
+  DCHECK(!ready_task.is_null());
+  DCHECK(!retry_task.is_null());
+  if (data_->scheduler()) {
+    // TODO(zea): set this based on whether cryptographer has keystore 
+    // encryption key or not (requires opening a transaction).
+    bool need_encryption_key = false;
+
+    // We do a cleanup if this is the first configuration after a restart (to
+    // handle the case where we failed to configure a previous type) or if we're
+    // disabling a type.
+    // Note: it's not necessary to check for empty progress markers. Any type
+    // that we attempted to enable would have been in the current routing info.
+    // If it failed to download, we'll either disable it, in which case it's
+    // removed from the routing info, or we attempt to retry it, in which case
+    // it would remain in the routing info (and since it didn't have
+    // initial_sync_ended set we'll ensure we attempt to redownload).
+    bool need_cleanup = false;
+    const browser_sync::ModelSafeRoutingInfo& current_routing_info =
+        data_->session_context()->routing_info();
+    if (current_routing_info.empty() ||                  // Restart case.

[rlarocque, 2012/06/04 23:01:38]

See CleanupDisabltedTypesCommand::ExecuteImpl().  We shouldn't need to have this
logic in both places.

[Nicolas Zea, 2012/06/07 19:25:42]

See other comment. This is gone now.

+        !GetRoutingInfoTypes(new_routing_info).HasAll(
+            GetRoutingInfoTypes(current_routing_info)))  // Disabled datatypes.
+      need_cleanup = true;
+
+    SyncScheduler::ConfigureParams params(
+        GetSourceFromReason(reason),
+        types_to_config,
+        new_routing_info,
+        need_cleanup,
+        need_encryption_key,
+        ready_task);
+    data_->scheduler()->Start(SyncScheduler::CONFIGURATION_MODE);
+    // Returns false if a retry has been scheduled. Either way, will invoke the
+    // ready task when the configure job completes.
+    if (!data_->scheduler()->Configure(params))
+      retry_task.Run();
+  } else {
+    LOG(INFO) << "SyncManager::ConfigureSyncer: bailing out because scheduler "
+              << "is null.";
+    ready_task.Run();
   }
-  StartConfigurationMode(base::Closure());
-  data_->session_context()->set_routing_info(routing_info);
-  data_->scheduler()->ScheduleConfig(types, GetSourceFromReason(reason));
-}
-
-void SyncManager::StartConfigurationMode(const base::Closure& callback) {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  if (!data_->scheduler()) {
-    LOG(INFO)
-        << "SyncManager::StartConfigurationMode: could not start "
-        << "configuration mode because because scheduler is null";
-    return;
-  }
-  data_->scheduler()->Start(
-      browser_sync::SyncScheduler::CONFIGURATION_MODE, callback);
 }
 
 bool SyncManager::SyncInternal::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,
     HttpPostProviderFactory* post_factory,
@@ skipping 64 matching lines @@
         &debug_info_event_listener_,
         &traffic_recorder_));
     session_context()->set_account_name(credentials.email);
     scheduler_.reset(new SyncScheduler(name_, session_context(), new Syncer()));
   }
 
   bool signed_in = SignIn(credentials);
 
   if (signed_in) {
     if (scheduler()) {
-      scheduler()->Start(
-          browser_sync::SyncScheduler::CONFIGURATION_MODE, base::Closure());
+      scheduler()->Start(SyncScheduler::CONFIGURATION_MODE);
     }
 
     initialized_ = true;
 
     // Cryptographer should only be accessed while holding a
     // transaction.  Grabbing the user share for the transaction
     // checks the initialization state, so this must come after
     // |initialized_| is set to true.
     ReadTransaction trans(FROM_HERE, GetUserShare());
     trans.GetCryptographer()->Bootstrap(restored_key_for_bootstrapping);
@@ skipping 153 matching lines @@
   allstatus_.SetCryptographerReady(cryptographer->is_ready());
   allstatus_.SetCryptoHasPendingKeys(cryptographer->has_pending_keys());
   debug_info_event_listener_.SetCryptographerReady(cryptographer->is_ready());
   debug_info_event_listener_.SetCrytographerHasPendingKeys(
       cryptographer->has_pending_keys());
 }
 
 void SyncManager::SyncInternal::StartSyncingNormally(
     const browser_sync::ModelSafeRoutingInfo& routing_info) {
   // Start the sync scheduler.
-  if (scheduler()) { // NULL during certain unittests.
-    session_context()->set_routing_info(routing_info);
-    scheduler()->Start(SyncScheduler::NORMAL_MODE, base::Closure());
-  }
+  if (scheduler())  // NULL during certain unittests.
+    scheduler()->Start(SyncScheduler::NORMAL_MODE);
 }
 
 bool SyncManager::SyncInternal::OpenDirectory() {
   DCHECK(!initialized_) << "Should only happen once";
 
   // Set before Open().
   change_observer_ =
       browser_sync::MakeWeakHandle(js_mutation_event_observer_.AsWeakPtr());
   WeakHandle<syncable::TransactionObserver> transaction_observer(
       browser_sync::MakeWeakHandle(js_mutation_event_observer_.AsWeakPtr()));
@@ skipping 1344 matching lines @@
     share->directory->GetDownloadProgress(i.Get(), &marker);
 
     if (marker.token().empty())
       result.Put(i.Get());
 
   }
   return result;
 }
 
 }  // namespace sync_api