Take 2: sync changes to support encryption

chrome/browser/sync/glue/password_model_associator.cc

 // Copyright (c) 2010 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/glue/password_model_associator.h"
 
 #include <set>
 
 #include "base/stl_util-inl.h"
 #include "base/utf_string_conversions.h"
@@ skipping 55 matching lines @@
   PasswordVector updated_passwords;
 
   for (std::vector<webkit_glue::PasswordForm*>::iterator ix = passwords.begin();
        ix != passwords.end(); ++ix) {
     if (IsAbortPending())
       return false;
     std::string tag = MakeTag(**ix);
 
     sync_api::ReadNode node(&trans);
     if (node.InitByClientTagLookup(syncable::PASSWORDS, tag)) {
-      sync_pb::PasswordSpecificsData password;
-      if (!node.GetPasswordSpecifics(&password)) {
-        STLDeleteElements(&passwords);
-        LOG(ERROR) << "Failed to get password specifics from sync node.";
-        return false;
-      }
+      const sync_pb::PasswordSpecificsData& password =
+          node.GetPasswordSpecifics();
       DCHECK_EQ(tag, MakeTag(password));
 
       webkit_glue::PasswordForm new_password;
 
       if (MergePasswords(password, **ix, &new_password)) {
         sync_api::WriteNode write_node(&trans);
         if (!write_node.InitByClientTagLookup(syncable::PASSWORDS, tag)) {
           STLDeleteElements(&passwords);
           LOG(ERROR) << "Failed to edit password sync node.";
           return false;
@@ skipping 22 matching lines @@
 
   STLDeleteElements(&passwords);
 
   int64 sync_child_id = password_root.GetFirstChildId();
   while (sync_child_id != sync_api::kInvalidId) {
     sync_api::ReadNode sync_child_node(&trans);
     if (!sync_child_node.InitByIdLookup(sync_child_id)) {
       LOG(ERROR) << "Failed to fetch child node.";
       return false;
     }
-    sync_pb::PasswordSpecificsData password;
-    if (!sync_child_node.GetPasswordSpecifics(&password)) {
-      LOG(ERROR) << "Failed to get specifics from password node.";
-      return false;
-    }
+    const sync_pb::PasswordSpecificsData& password =
+        sync_child_node.GetPasswordSpecifics();
     std::string tag = MakeTag(password);
 
     // The password only exists on the server.  Add it to the local
     // model.
     if (current_passwords.find(tag) == current_passwords.end()) {
       webkit_glue::PasswordForm new_password;
 
       CopyPassword(password, &new_password);
       Associate(&tag, sync_child_node.GetId());
       new_passwords.push_back(new_password);
@@ skipping 259 matching lines @@
     const std::string& password_element,
     const std::string& signon_realm) {
   return EscapePath(origin_url) + "|" +
          EscapePath(username_element) + "|" +
          EscapePath(username_value) + "|" +
          EscapePath(password_element) + "|" +
          EscapePath(signon_realm);
 }
 
 }  // namespace browser_sync