[Sync] Implement keystore migration support.

sync/engine/apply_control_data_updates.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/engine/apply_control_data_updates.h"
 
 #include "base/metrics/histogram.h"
 #include "sync/engine/conflict_resolver.h"
 #include "sync/engine/conflict_util.h"
 #include "sync/engine/syncer_util.h"
@@ skipping 99 matching lines @@
     //   default encryption key marked as an implicit passphrase.
     // This works fine except for the case where we had locally set an
     // explicit passphrase. In that case the nigori node will have the default
     // key based on the local explicit passphassphrase, but will not have it
     // marked as explicit. To fix this we'd have to track whether we have a
     // explicit passphrase or not separate from the nigori, which would
     // introduce even more complexity, so we leave it up to the user to reset
     // that passphrase as an explicit one via settings. The goal here is to
     // ensure both sets of encryption keys are preserved.
     if (cryptographer->is_ready()) {
-      cryptographer->GetKeys(server_nigori->mutable_encrypted());
-      server_nigori->set_using_explicit_passphrase(
-          nigori_node.Get(SPECIFICS).nigori().using_explicit_passphrase());
+      cryptographer->GetKeys(server_nigori->mutable_encryption_keybag());
+      server_nigori->set_keybag_is_frozen(
+          nigori_node.Get(SPECIFICS).nigori().keybag_is_frozen());
     }
     nigori_node.Put(SPECIFICS, specifics);
     DVLOG(1) << "Resolving simple conflict, merging nigori nodes: "
              << nigori_node;
 
     OverwriteServerChanges(&nigori_node);
 
     UMA_HISTOGRAM_ENUMERATION("Sync.ResolveSimpleConflict",
                               ConflictResolver::NIGORI_MERGE,
                               ConflictResolver::CONFLICT_RESOLUTION_SIZE);
   }
 
   return true;
 }
 
 }  // namespace syncer