Fill the un-encrypted metadata field in password specifics.

components/sync/core/write_node.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 "components/sync/core/write_node.h"
 
 #include <stdint.h>
 
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "components/sync/base/cryptographer.h"
 #include "components/sync/core/base_transaction.h"
+#include "components/sync/core/password_metadata_filling.h"
 #include "components/sync/core/write_transaction.h"
 #include "components/sync/core_impl/syncapi_internal.h"
 #include "components/sync/protocol/bookmark_specifics.pb.h"
 #include "components/sync/protocol/typed_url_specifics.pb.h"
 #include "components/sync/syncable/mutable_entry.h"
 #include "components/sync/syncable/nigori_util.h"
 #include "components/sync/syncable/syncable_util.h"
 
 using std::string;
 using std::vector;
@@ skipping 105 matching lines @@
   const sync_pb::EntitySpecifics& old_specifics = GetEntitySpecifics();
   sync_pb::EntitySpecifics entity_specifics;
   // Copy over the old specifics if they exist.
   if (GetModelTypeFromSpecifics(old_specifics) == PASSWORDS) {
     entity_specifics.CopyFrom(old_specifics);
   } else {
     AddDefaultFieldValue(PASSWORDS, &entity_specifics);
   }
   sync_pb::PasswordSpecifics* password_specifics =
       entity_specifics.mutable_password();
+
+  const std::string metadata_url(data.signon_realm());
+  if (!IsExplicitPassphrase(GetTransaction()->GetPassphraseType()) &&
+      base::FeatureList::IsEnabled(kPasswordsMetadataFilling) &&
+      password_specifics->unencrypted_metadata().url() != metadata_url) {
+    password_specifics->mutable_unencrypted_metadata()->set_url(metadata_url);
+  }

[Nicolas Zea, 2016/09/23 23:10:37]

nit: newline after

[melandory, 2016/10/04 10:13:12]

Done.

   // This will only update password_specifics if the underlying unencrypted blob
   // was different from |data| or was not encrypted with the proper passphrase.
   if (!cryptographer->Encrypt(data, password_specifics->mutable_encrypted())) {
     LOG(ERROR) << "Failed to encrypt password, possibly due to sync node "
                << "corruption";
     return;
   }
   SetEntitySpecifics(entity_specifics);
 }
 
@@ skipping 320 matching lines @@
   syncable::Id predecessor_id =
       predecessor ? predecessor->GetSyncId() : syncable::Id();
   return entry_->PutPredecessor(predecessor_id);
 }
 
 void WriteNode::MarkForSyncing() {
   syncable::MarkForSyncing(entry_);
 }
 
 }  // namespace syncer