Take 2: sync changes to support encryption

chrome/browser/sync/profile_sync_service_password_unittest.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 <vector>
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 #include "base/task.h"
 #include "base/time.h"
@@ skipping 126 matching lines @@
                                               password_store_.get(),
                                               data_type_controller));
       EXPECT_CALL(factory_, CreateDataTypeManager(_, _)).
           WillOnce(MakeDataTypeManager(&backend_));
 
       EXPECT_CALL(profile_, GetPasswordStore(_)).
           WillOnce(Return(password_store_.get()));
 
       // State changes once for the backend init and once for startup done.
       EXPECT_CALL(observer_, OnStateChanged()).
+          WillOnce(Return()).
+          WillOnce(Return()).
+          WillOnce(QuitUIMessageLoop());
+
+      service_->RegisterDataTypeController(data_type_controller);
+      service_->Initialize();
+      MessageLoop::current()->Run();
+
+      EXPECT_CALL(observer_, OnStateChanged()).
           WillOnce(InvokeTask(task)).
           WillOnce(Return()).
           WillOnce(QuitUIMessageLoop());
-      service_->RegisterDataTypeController(data_type_controller);
-      service_->Initialize();
+
+      service_->SetPassphrase("foo");
       MessageLoop::current()->Run();
     }
   }
 
   void CreatePasswordRoot() {
     UserShare* user_share = service_->backend()->GetUserShareHandle();
     DirectoryManager* dir_manager = user_share->dir_manager.get();
 
     ScopedDirLookup dir(dir_manager, user_share->authenticated_name);
     ASSERT_TRUE(dir.good());
@@ skipping 34 matching lines @@
   void GetPasswordEntriesFromSyncDB(std::vector<PasswordForm>* entries) {
     sync_api::ReadTransaction trans(service_->backend()->GetUserShareHandle());
     sync_api::ReadNode password_root(&trans);
     ASSERT_TRUE(password_root.InitByTagLookup(browser_sync::kPasswordTag));
 
     int64 child_id = password_root.GetFirstChildId();
     while (child_id != sync_api::kInvalidId) {
       sync_api::ReadNode child_node(&trans);
       ASSERT_TRUE(child_node.InitByIdLookup(child_id));
 
-      sync_pb::PasswordSpecificsData password;
-      ASSERT_TRUE(child_node.GetPasswordSpecifics(&password));
+      const sync_pb::PasswordSpecificsData& password =
+          child_node.GetPasswordSpecifics();
 
       PasswordForm form;
       PasswordModelAssociator::CopyPassword(password, &form);
 
       entries->push_back(form);
 
       child_id = child_node.GetSuccessorId();
     }
   }
 
@@ skipping 65 matching lines @@
   }
 
  private:
   ProfileSyncServicePasswordTest* test_;
   const std::vector<PasswordForm>& entries_;
 };
 
 TEST_F(ProfileSyncServicePasswordTest, FailModelAssociation) {
   // Backend will be paused but not resumed.
   EXPECT_CALL(backend_, RequestPause()).
-      WillOnce(testing::DoAll(Notify(NotificationType::SYNC_PAUSED),
-                              testing::Return(true)));
+      WillRepeatedly(testing::DoAll(Notify(NotificationType::SYNC_PAUSED),
+                                    testing::Return(true)));
   // Don't create the root password node so startup fails.
   StartSyncService(NULL);
   EXPECT_TRUE(service_->unrecoverable_error_detected());
 }
 
 TEST_F(ProfileSyncServicePasswordTest, EmptyNativeEmptySync) {
   EXPECT_CALL(*(password_store_.get()), FillAutofillableLogins(_))
       .WillOnce(Return(true));
   EXPECT_CALL(*(password_store_.get()), FillBlacklistLogins(_))
       .WillOnce(Return(true));
@@ skipping 213 matching lines @@
 
   EXPECT_CALL(*(password_store_.get()), UpdateLoginImpl(_)).Times(1);
   StartSyncService(&task);
 
   std::vector<PasswordForm> new_sync_forms;
   GetPasswordEntriesFromSyncDB(&new_sync_forms);
 
   EXPECT_EQ(1U, new_sync_forms.size());
   EXPECT_TRUE(ComparePasswords(expected_forms[0], new_sync_forms[0]));
 }