[Sync] Cache encrypted types info in ProfileSyncService

chrome/browser/sync/profile_sync_service.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/profile_sync_service.h"
 
 #include <algorithm>
 #include <cstddef>
 #include <map>
 #include <set>
@@ skipping 93 matching lines @@
       cros_user_(cros_user),
       sync_service_url_(kDevServerUrl),
       backend_initialized_(false),
       is_auth_in_progress_(false),
       wizard_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
       signin_(signin_manager),
       unrecoverable_error_detected_(false),
       scoped_runnable_method_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
       expect_sync_configuration_aborted_(false),
       clear_server_data_state_(CLEAR_NOT_STARTED),
+      encrypted_types_(browser_sync::Cryptographer::SensitiveTypes()),
+      encrypt_everything_(false),
       encryption_pending_(false),
       auto_start_enabled_(false),
       failed_datatypes_handler_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
   // By default, dev, canary, and unbranded Chromium users will go to the
   // development servers. Development servers have more features than standard
   // sync servers. Users with officially-branded Chrome stable and beta builds
   // will go to the standard sync servers.
   //
   // GetChannel hits the registry on Windows. See http://crbug.com/70380.
   base::ThreadRestrictions::ScopedAllowIO allow_io;
@@ skipping 292 matching lines @@
   }
 
   scoped_runnable_method_factory_.RevokeAll();
 
   // Clear various flags.
   expect_sync_configuration_aborted_ = false;
   is_auth_in_progress_ = false;
   backend_initialized_ = false;
   cached_passphrases_ = CachedPassphrases();
   encryption_pending_ = false;
+  encrypt_everything_ = false;
+  encrypted_types_ = browser_sync::Cryptographer::SensitiveTypes();
   passphrase_required_reason_ = sync_api::REASON_PASSPHRASE_NOT_REQUIRED;
   last_attempted_user_email_.clear();
   last_auth_error_ = GoogleServiceAuthError::None();
 
   if (sync_global_error_.get()) {
     GlobalErrorServiceFactory::GetForProfile(profile_)->RemoveGlobalError(
         sync_global_error_.get());
     RemoveObserver(sync_global_error_.get());
     sync_global_error_.reset(NULL);
   }
@@ skipping 112 matching lines @@
   if (!success) {
     // If backend initialization failed, abort.  We only want to blow away
     // state (DBs, etc) if this was a first-time scenario that failed.
     wizard_.Step(SyncSetupWizard::FATAL_ERROR);
     Shutdown(!HasSyncSetupCompleted());
     return;
   }
 
   backend_initialized_ = true;
 
+  // Get initial encrypted types and encrypt everything setting.
+  // TODO(akalin): Ideally these would be parameters to
+  // OnBackendInitialized().
+  encrypted_types_ = backend_->GetEncryptedDataTypes();
+  DCHECK_GT(encrypted_types_.count(syncable::PASSWORDS), 0u);
+  encrypt_everything_ = backend_->EncryptEverythingEnabled();
+
   sync_js_controller_.AttachJsBackend(js_backend);
 
   // The very first time the backend initializes is effectively the first time
   // we can say we successfully "synced".  last_synced_time_ will only be null
   // in this case, because the pref wasn't restored on StartUp.
   if (last_synced_time_.is_null()) {
     UpdateLastSyncedTime();
   }
   NotifyObservers();
 
@@ skipping 260 matching lines @@
   // wizard we're done (no need to hang around waiting for the sync to
   // complete). If encryption is pending, its successful completion will trigger
   // the done step.
   if (WizardIsVisible() && !encryption_pending())
     wizard_.Step(SyncSetupWizard::DONE);
 
   NotifyObservers();
 }
 
 void ProfileSyncService::OnEncryptionComplete(
-    const syncable::ModelTypeSet& encrypted_types) {
+    const syncable::ModelTypeSet& encrypted_types,
+    bool encrypt_everything) {
+  encrypted_types_ = encrypted_types;
+  encrypt_everything_ = encrypt_everything;
+  VLOG(2) << "Encryption complete for "
+          << syncable::ModelTypeSetToString(encrypted_types)
+          << " (encrypt everything is set to "
+          << (encrypt_everything_ ? "true" : "false") << ")";
+  DCHECK_GT(encrypted_types_.count(syncable::PASSWORDS), 0u);
   if (encryption_pending_) {
     syncable::ModelTypeSet registered_types;
     GetRegisteredDataTypes(&registered_types);
     bool encryption_complete = true;
     for (syncable::ModelTypeSet::const_iterator it = registered_types.begin();
          it != registered_types.end();
          ++it) {
       if (encrypted_types.count(*it) == 0) {
         // One of our types is not yet encrypted - keep waiting.
         encryption_complete = false;
@@ skipping 465 matching lines @@
     if (is_explicit) {
       cached_passphrases_.explicit_passphrase = passphrase;
     } else {
       cached_passphrases_.gaia_passphrase = passphrase;
     }
   }
 }
 
 void ProfileSyncService::SetEncryptEverything(bool encrypt_everything) {
   encryption_pending_ = encrypt_everything;
+  encrypt_everything_ = false;

[Nicolas Zea, 2011/10/20 18:40:41]

presumably encrypt_everything_ should already be false here right? perhaps
change this to a DCHECK?

[akalin, 2011/10/21 02:24:17]

Done.

 }
 
 bool ProfileSyncService::encryption_pending() const {
   return encryption_pending_;
 }
 
 bool ProfileSyncService::EncryptEverythingEnabled() const {
   if (!backend_.get() || !backend_initialized_) {
     NOTREACHED() << "Cannot check encryption without initialized backend.";
     return false;
   }
   return backend_->EncryptEverythingEnabled();
 }
 
-// This will open a transaction to get the encrypted types. Do not call this
-// if you already have a transaction open.
 void ProfileSyncService::GetEncryptedDataTypes(
     syncable::ModelTypeSet* encrypted_types) const {
   CHECK(encrypted_types);
-  if (backend_.get()) {
-    *encrypted_types = backend_->GetEncryptedDataTypes();
-    DCHECK(encrypted_types->count(syncable::PASSWORDS));
-  } else {
-    // Either we are in an unrecoverable error or the sync is not yet done
-    // initializing. In either case just return the sensitive types. During
-    // sync initialization the UI might need to know what our encrypted
-    // types are.
-    *encrypted_types = browser_sync::Cryptographer::SensitiveTypes();
-    DCHECK(encrypted_types->count(syncable::PASSWORDS));
-  }
+  *encrypted_types = encrypted_types_;

[Nicolas Zea, 2011/10/20 18:40:41]

Is it valid to call this before the backend is initialized? Perhaps add a
DCHECK? We won't crash anymore, but it's still not the correct set of encrypted
types. 

[akalin, 2011/10/21 02:24:17]

Yeah, the UI functions call it.  Sigh.

+  DCHECK_GT(encrypted_types->count(syncable::PASSWORDS), 0u);
 }
 
 void ProfileSyncService::OnSyncManagedPrefChange(bool is_sync_managed) {
   NotifyObservers();
   if (is_sync_managed) {
     DisableForUser();
   } else if (HasSyncSetupCompleted() && AreCredentialsAvailable()) {
     StartUp();
   }
 }
@@ skipping 166 matching lines @@
             << "Unrecoverable error.";
   } else {
     VLOG(0) << "ConfigureDataTypeManager not invoked because backend is not "
             << "initialized";
   }
 }
 
 const FailedDatatypesHandler& ProfileSyncService::failed_datatypes_handler() {
   return failed_datatypes_handler_;
 }