Call SetPassphrase() to re-encrypt the user's data after re-auth.

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 420 matching lines @@
       break;
     }
     case SyncSetupWizard::GAIA_LOGIN: {
       DictionaryValue args;
       SyncSetupFlow::GetArgsForGaiaLogin(service_, &args);
       flow_handler_->ShowGaiaLogin(args);
       break;
     }
     case SyncSetupWizard::GAIA_SUCCESS:
       if (end_state_ == SyncSetupWizard::GAIA_SUCCESS) {
+        // The user has just re-authed - set the passphrase so we can re-encrypt
+        // if necessary. If we are currently encrypting with an explicit
+        // passphrase, this does nothing.
+        // TODO(atwilson): Move all the code dealing with the implicit GAIA
+        // passphrase back into ProfileSyncService in a
+        // NOTIFICATION_GOOGLE_SIGNIN_SUCCESSFUL listener once we get rid of
+        // SyncSetupFlow.
+        if (!cached_passphrase_.empty())
+          service_->SetPassphrase(cached_passphrase_, false);
         flow_handler_->ShowGaiaSuccessAndClose();
         break;
       }
       flow_handler_->ShowGaiaSuccessAndSettingUp();
       break;
     case SyncSetupWizard::SYNC_EVERYTHING: {
       DictionaryValue args;
       SyncSetupFlow::GetArgsForConfigure(service_, &args);
       args.SetBoolean("showSyncEverythingPage", true);
       flow_handler_->ShowConfigure(args);
@@ skipping 43 matching lines @@
     case SyncSetupWizard::DONE:
     case SyncSetupWizard::ABORT:
       flow_handler_->ShowSetupDone(UTF8ToUTF16(
           service_->profile()->GetPrefs()->GetString(
           prefs::kGoogleServicesUsername)));
       break;
     default:
       NOTREACHED() << "Invalid advance state: " << state;
   }
 }