[Sync] Fix encryption/passphrase handling.

chrome/browser/sync/sync_setup_flow.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/sync_setup_flow.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ skipping 244 matching lines @@
                                         const std::string& password,
                                         const std::string& captcha,
                                         const std::string& access_code) {
   service_->OnUserSubmittedAuth(username, password, captcha, access_code);
 }
 
 void SyncSetupFlow::OnUserConfigured(const SyncConfiguration& configuration) {
   // Go to the "loading..." screen.
   Advance(SyncSetupWizard::SETTING_UP);
 
+  // Note: encryption calls must be made before OnUserChoseDatatypes.
+  // TODO(zea): Fix this.
   if (configuration.encrypt_all) {
     syncable::ModelTypeSet data_types;
     service_->GetRegisteredDataTypes(&data_types);
     service_->EncryptDataTypes(data_types);
+  } else {
+    // Necessary in case we had attempted to encrypt datatypes previously
+    // but were unable to complete and the user wants to cancel out (for
+    // example due to needing a passphrase).
+    service_->EncryptDataTypes(syncable::ModelTypeSet());
   }
 
   // If we are activating the passphrase, we need to have one supplied.
   DCHECK(service_->IsUsingSecondaryPassphrase() ||
          !configuration.use_secondary_passphrase ||
          configuration.secondary_passphrase.length() > 0);
 
   if (configuration.use_secondary_passphrase) {
     if (!service_->IsUsingSecondaryPassphrase()) {
       service_->SetPassphrase(configuration.secondary_passphrase, true, true);
@@ skipping 148 matching lines @@
       break;
     }
     case SyncSetupWizard::DONE:
       flow_handler_->ShowSetupDone(
           UTF16ToWide(service_->GetAuthenticatedUsername()));
       break;
     default:
       NOTREACHED() << "Invalid advance state: " << state;
   }
 }