Take 2: sync changes to support encryption

chrome/browser/sync/profile_sync_service.cc

 // Copyright (c) 2006-2008 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/profile_sync_service.h"
 
 #include <map>
 #include <set>
 
 #include "app/l10n_util.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/histogram.h"
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/task.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/sync/engine/syncapi.h"
 #include "chrome/browser/sync/glue/change_processor.h"
 #include "chrome/browser/sync/glue/data_type_controller.h"
 #include "chrome/browser/sync/glue/data_type_manager.h"
 #include "chrome/browser/sync/profile_sync_factory.h"
+#include "chrome/browser/sync/syncable/directory_manager.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_source.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/time_format.h"
 #include "grit/generated_resources.h"
 #include "net/base/cookie_monster.h"
 
@@ skipping 31 matching lines @@
       ALLOW_THIS_IN_INITIALIZER_LIST(scoped_runnable_method_factory_(this)) {
   DCHECK(factory);
   DCHECK(profile);
   DCHECK(network_change_notifier_thread_);
   registrar_.Add(this,
                  NotificationType::SYNC_CONFIGURE_START,
                  NotificationService::AllSources());
   registrar_.Add(this,
                  NotificationType::SYNC_CONFIGURE_DONE,
                  NotificationService::AllSources());
+  registrar_.Add(this,
+                 NotificationType::SYNC_PASSPHRASE_REQUIRED,
+                 NotificationService::AllSources());
+  registrar_.Add(this,
+                 NotificationType::SYNC_PASSPHRASE_ACCEPTED,
+                 NotificationService::AllSources());
 
   // By default, dev & chromium users will go to the development servers.
   // Dev servers have more features than standard sync servers.
   // Chrome stable and beta builds will go to the standard sync servers.
 #if defined(GOOGLE_CHROME_BUILD)
   // For stable, this is "". For dev, this is "dev". For beta, this is "beta".
   // For linux Chromium builds, this could be anything depending on the
   // distribution, so always direct those users to dev server urls.
   // If this is an official build, it will always be one of the above.
   string16 channel = platform_util::GetVersionStringModifier();
@@ skipping 552 matching lines @@
   // The data_type_controllers_ are determined by command-line flags; that's
   // effectively what controls the values returned here.
   for (DataTypeController::TypeMap::const_iterator it =
        data_type_controllers_.begin();
        it != data_type_controllers_.end(); ++it) {
     registered_types->insert((*it).first);
   }
 }
 
 bool ProfileSyncService::IsCryptographerReady() const {
-  // TODO(albertb): Replace this once the crypto patch lands.
-  return true;
+  return backend_->GetUserShareHandle()->
+      dir_manager->cryptographer()->is_ready();
+}
+
+void ProfileSyncService::SetPassphrase(const std::string& passphrase) {
+  backend_->SetPassphrase(passphrase);
 }
 
 void ProfileSyncService::StartProcessingChangesIfReady() {
   DCHECK(backend_initialized_);
 
   if (bootstrap_sync_authentication_) {
     SetSyncSetupCompleted();
   }
 
   data_type_manager_.reset(
@@ skipping 38 matching lines @@
       if (result != DataTypeManager::OK) {
         OnUnrecoverableError(FROM_HERE, "Sync Configuration failed.");
         return;
       }
 
       // TODO(sync): Less wizard, more toast.
       wizard_.Step(SyncSetupWizard::DONE);
       FOR_EACH_OBSERVER(Observer, observers_, OnStateChanged());
       break;
     }
+    case NotificationType::SYNC_PASSPHRASE_REQUIRED: {
+      // TODO(sync): Show the passphrase UI here.
+      SetPassphrase("dummy passphrase");
+      break;
+    }
+    case NotificationType::SYNC_PASSPHRASE_ACCEPTED: {
+      // Make sure the data types that depend on the passphrase are started at
+      // this time.
+      syncable::ModelTypeSet types;
+      GetPreferredDataTypes(&types);
+      data_type_manager_->Configure(types);
+
+      FOR_EACH_OBSERVER(Observer, observers_, OnStateChanged());
+      break;
+    }
     default: {
       NOTREACHED();
     }
   }
 }
 
 void ProfileSyncService::AddObserver(Observer* observer) {
   observers_.AddObserver(observer);
 }
 
@@ skipping 16 matching lines @@
   // is initialized, all enabled data types are consistent with one
   // another, and no unrecoverable error has transpired.
   if (unrecoverable_error_detected_)
     return false;
 
   if (!data_type_manager_.get())
     return false;
 
   return data_type_manager_->state() == DataTypeManager::CONFIGURED;
 }