Fix GMOCK warnings in password_manager

In password_manager_unittests and password_form_manager_unittests.

Review URL: https://codereview.chromium.org/279193002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269939 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 16 insertions, 2 deletions

diff --git a/components/password_manager/core/browser/password_form_manager_unittest.cc b/components/password_manager/core/browser/password_form_manager_unittest.cc
index 0e76081..1599f44 100644
--- a/components/password_manager/core/browser/password_form_manager_unittest.cc
+++ b/components/password_manager/core/browser/password_form_manager_unittest.cc
@@ -380,6 +380,10 @@ TEST_F(PasswordFormManagerTest, TestAlternateUsername) {
   TestPasswordManager password_manager(&client);
   scoped_ptr<PasswordFormManager> manager(new PasswordFormManager(
       &password_manager, &client, client.GetDriver(), *observed_form(), false));
+  EXPECT_CALL(*client.GetMockDriver(), AllowPasswordGenerationForForm(_))
+      .Times(1);
+  EXPECT_CALL(*client.GetMockDriver(), IsOffTheRecord())
+      .WillRepeatedly(Return(false));
 
   password_store->AddLogin(*saved_match());
   manager->FetchMatchingLoginsFromPasswordStore(PasswordStore::ALLOW_PROMPT);
@@ -411,6 +415,8 @@ TEST_F(PasswordFormManagerTest, TestAlternateUsername) {
   // This time use an alternate username
   manager.reset(new PasswordFormManager(
       &password_manager, &client, client.GetDriver(), *observed_form(), false));
+  EXPECT_CALL(*client.GetMockDriver(), AllowPasswordGenerationForForm(_))
+      .Times(1);
   password_store->Clear();
   password_store->AddLogin(*saved_match());
   manager->FetchMatchingLoginsFromPasswordStore(PasswordStore::ALLOW_PROMPT);
@@ -529,6 +535,8 @@ TEST_F(PasswordFormManagerTest, TestSendNotBlacklistedMessage) {
       &password_manager, &client, client.GetDriver(), *observed_form(), false));
   EXPECT_CALL(*client.GetMockDriver(), AllowPasswordGenerationForForm(_))
       .Times(1);
+  EXPECT_CALL(*client.GetMockDriver(), IsOffTheRecord())
+      .WillRepeatedly(Return(false));
   SimulateFetchMatchingLoginsFromPasswordStore(manager.get());
   // We need add heap allocated objects to result.
   result.push_back(CreateSavedMatch(false));
@@ -556,6 +564,10 @@ TEST_F(PasswordFormManagerTest, TestForceInclusionOfGeneratedPasswords) {
   TestPasswordManager password_manager(&client);
   scoped_ptr<PasswordFormManager> manager(new PasswordFormManager(
       &password_manager, &client, client.GetDriver(), *observed_form(), false));
+  EXPECT_CALL(*client.GetMockDriver(), AllowPasswordGenerationForForm(_))
+      .Times(1);
+  EXPECT_CALL(*client.GetMockDriver(), IsOffTheRecord())
+      .WillRepeatedly(Return(false));
 
   // Simulate having two matches for this origin, one of which was from a form
   // with different HTML tags for elements. Because of scoring differences,
@@ -575,6 +587,9 @@ TEST_F(PasswordFormManagerTest, TestForceInclusionOfGeneratedPasswords) {
   // well are generated. They should now be sent to Autofill().
   manager.reset(new PasswordFormManager(
       &password_manager, &client, client.GetDriver(), *observed_form(), false));
+  EXPECT_CALL(*client.GetMockDriver(), AllowPasswordGenerationForForm(_))
+      .Times(1);
+
   results.push_back(CreateSavedMatch(false));
   results.push_back(CreateSavedMatch(false));
   results[1]->username_value = ASCIIToUTF16("other@gmail.com");
diff --git a/components/password_manager/core/browser/password_manager_unittest.cc b/components/password_manager/core/browser/password_manager_unittest.cc
index 4a4244b..a22aca4 100644
--- a/components/password_manager/core/browser/password_manager_unittest.cc
+++ b/components/password_manager/core/browser/password_manager_unittest.cc
@@ -71,6 +71,7 @@ class PasswordManagerTest : public testing::Test {
                                            true);
 
     store_ = new MockPasswordStore;
+    EXPECT_CALL(*store_, ReportMetrics()).Times(AnyNumber());
     CHECK(store_->Init(syncer::SyncableService::StartSyncFlare()));
 
     EXPECT_CALL(client_, GetPasswordStore()).WillRepeatedly(Return(store_));
@@ -91,8 +92,6 @@ class PasswordManagerTest : public testing::Test {
     EXPECT_CALL(driver_, AllowPasswordGenerationForForm(_)).Times(AnyNumber());
     EXPECT_CALL(driver_, GetPasswordAutofillManager())
         .WillRepeatedly(Return(password_autofill_manager_.get()));
-
-    EXPECT_CALL(*store_, ReportMetricsImpl()).Times(AnyNumber());
   }
 
   virtual void TearDown() {