Take 2: sync changes to support encryption

chrome/browser/sync/glue/password_change_processor.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_change_processor.h"
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/password_manager/password_store.h"
 #include "chrome/browser/password_manager/password_store_change.h"
@@ skipping 135 matching lines @@
     if (!sync_node.InitByIdLookup(changes[i].id)) {
       error_handler()->OnUnrecoverableError(FROM_HERE,
           "Password node lookup failed.");
       return;
     }
 
     // Check that the changed node is a child of the passwords folder.
     DCHECK(password_root.GetId() == sync_node.GetParentId());
     DCHECK(syncable::PASSWORDS == sync_node.GetModelType());
 
-    sync_pb::PasswordSpecificsData password_data;
-    if (!sync_node.GetPasswordSpecifics(&password_data)) {
-      error_handler()->OnUnrecoverableError(FROM_HERE,
-          "Could not read password specifics");
-      return;
-    }
+    const sync_pb::PasswordSpecificsData& password_data =
+        sync_node.GetPasswordSpecifics();
     webkit_glue::PasswordForm password;
     PasswordModelAssociator::CopyPassword(password_data,
                                           &password);
 
     if (sync_api::SyncManager::ChangeRecord::ACTION_ADD == changes[i].action) {
       new_passwords.push_back(password);
     } else if (sync_api::SyncManager::ChangeRecord::ACTION_DELETE ==
                changes[i].action) {
       deleted_passwords.push_back(password);
     } else {
@@ skipping 31 matching lines @@
 }
 
 void PasswordChangeProcessor::StopObserving() {
   DCHECK(expected_loop_ == MessageLoop::current());
   notification_registrar_.Remove(this,
                                  NotificationType::LOGINS_CHANGED,
                                  NotificationService::AllSources());
 }
 
 }  // namespace browser_sync