Merge 73754 - [SYNC] Fix handling of password store corruption....

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 171 matching lines @@
           WillOnce(ReturnNewDataTypeManager());
 
       // We need tokens to get the tests going
       token_service_.IssueAuthTokenForTest(
           GaiaConstants::kSyncService, "token");
 
       EXPECT_CALL(profile_, GetTokenService()).
           WillRepeatedly(Return(&token_service_));
 
       EXPECT_CALL(profile_, GetPasswordStore(_)).
-          Times(2).
+          Times(3).
           WillRepeatedly(Return(password_store_.get()));
 
       EXPECT_CALL(observer_,
           Observe(
               NotificationType(NotificationType::SYNC_CONFIGURE_DONE),_,_));
 
       service_->RegisterDataTypeController(data_type_controller);
       service_->Initialize();
       MessageLoop::current()->Run();
 
@@ skipping 319 matching lines @@
   AddPasswordEntriesTask node_task(this, sync_forms);
 
   StartSyncService(&root_task, &node_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]));
 }