Clean up WebNavigationObserver by taking out password specific callbacks, and...

chrome/browser/password_manager/password_manager_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 "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_thread.h"
@@ skipping 119 matching lines @@
 
 TEST_F(PasswordManagerTest, FormSubmitEmptyStore) {
   // Test that observing a newly submitted form shows the save password bar.
   std::vector<PasswordForm*> result;  // Empty password store.
   EXPECT_CALL(delegate_, FillPasswordForm(_)).Times(Exactly(0));
   EXPECT_CALL(*store_, GetLogins(_,_))
       .WillOnce(DoAll(WithArg<1>(InvokeConsumer(0, result)), Return(0)));
   std::vector<PasswordForm> observed;
   PasswordForm form(MakeSimpleForm());
   observed.push_back(form);
-  manager()->PasswordFormsFound(observed);  // The initial load.
-  manager()->PasswordFormsVisible(observed);  // The initial layout.
+  manager()->OnPasswordFormsFound(observed);  // The initial load.
+  manager()->OnPasswordFormsVisible(observed);  // The initial layout.
 
   // And the form submit contract is to call ProvisionallySavePassword.
   manager()->ProvisionallySavePassword(form);
 
   scoped_ptr<PasswordFormManager> form_to_save;
   EXPECT_CALL(delegate_, AddSavePasswordInfoBar(_))
       .WillOnce(WithArg<0>(SaveToScopedPtr(&form_to_save)));
 
   // Now the password manager waits for the navigation to complete.
   manager()->DidStopLoading();
@@ skipping 13 matching lines @@
   PasswordForm* existing_different = new PasswordForm(MakeSimpleForm());
   existing_different->username_value = ASCIIToUTF16("google2");
   result.push_back(existing_different);
   EXPECT_CALL(delegate_, FillPasswordForm(_));
   EXPECT_CALL(*store_, GetLogins(_,_))
       .WillOnce(DoAll(WithArg<1>(InvokeConsumer(0, result)), Return(0)));
 
   std::vector<PasswordForm> observed;
   PasswordForm form(MakeSimpleForm());
   observed.push_back(form);
-  manager()->PasswordFormsFound(observed);  // The initial load.
-  manager()->PasswordFormsVisible(observed);  // The initial layout.
+  manager()->OnPasswordFormsFound(observed);  // The initial load.
+  manager()->OnPasswordFormsVisible(observed);  // The initial layout.
   manager()->ProvisionallySavePassword(form);
 
   // We still expect an add, since we didn't have a good match.
   scoped_ptr<PasswordFormManager> form_to_save;
   EXPECT_CALL(delegate_, AddSavePasswordInfoBar(_))
       .WillOnce(WithArg<0>(SaveToScopedPtr(&form_to_save)));
 
   manager()->DidStopLoading();
 
   EXPECT_CALL(*store_, AddLogin(FormMatches(form)));
   // Simulate saving the form.
   form_to_save->Save();
 }
 
 TEST_F(PasswordManagerTest, FormSeenThenLeftPage) {
   std::vector<PasswordForm*> result;  // Empty password store.
   EXPECT_CALL(delegate_, FillPasswordForm(_)).Times(Exactly(0));
   EXPECT_CALL(*store_, GetLogins(_,_))
     .WillOnce(DoAll(WithArg<1>(InvokeConsumer(0, result)), Return(0)));
   std::vector<PasswordForm> observed;
   PasswordForm form(MakeSimpleForm());
   observed.push_back(form);
-  manager()->PasswordFormsFound(observed);  // The initial load.
-  manager()->PasswordFormsVisible(observed);  // The initial layout.
+  manager()->OnPasswordFormsFound(observed);  // The initial load.
+  manager()->OnPasswordFormsVisible(observed);  // The initial layout.
 
   manager()->DidNavigate();
 
   // No expected calls.
   manager()->DidStopLoading();
 }
 
 TEST_F(PasswordManagerTest, FormSubmitFailedLogin) {
   std::vector<PasswordForm*> result;  // Empty password store.
   EXPECT_CALL(delegate_, FillPasswordForm(_)).Times(Exactly(0));
   EXPECT_CALL(*store_, GetLogins(_,_))
     .WillRepeatedly(DoAll(WithArg<1>(InvokeConsumer(0, result)), Return(0)));
   std::vector<PasswordForm> observed;
   PasswordForm form(MakeSimpleForm());
   observed.push_back(form);
-  manager()->PasswordFormsFound(observed);  // The initial load.
-  manager()->PasswordFormsVisible(observed);  // The initial layout.
+  manager()->OnPasswordFormsFound(observed);  // The initial load.
+  manager()->OnPasswordFormsVisible(observed);  // The initial layout.
 
   manager()->ProvisionallySavePassword(form);
 
   // The form reappears, and is visible in the layout:
-  manager()->PasswordFormsFound(observed);
-  manager()->PasswordFormsVisible(observed);
+  manager()->OnPasswordFormsFound(observed);
+  manager()->OnPasswordFormsVisible(observed);
 
   // No expected calls to the PasswordStore...
   manager()->DidStopLoading();
 }
 
 TEST_F(PasswordManagerTest, FormSubmitInvisibleLogin) {
   // Tests fix of issue 28911: if the login form reappears on the subsequent
   // page, but is invisible, it shouldn't count as a failed login.
   std::vector<PasswordForm*> result;  // Empty password store.
   EXPECT_CALL(delegate_, FillPasswordForm(_)).Times(Exactly(0));
   EXPECT_CALL(*store_, GetLogins(_,_))
       .WillRepeatedly(DoAll(WithArg<1>(InvokeConsumer(0, result)), Return(0)));
   std::vector<PasswordForm> observed;
   PasswordForm form(MakeSimpleForm());
   observed.push_back(form);
-  manager()->PasswordFormsFound(observed);  // The initial load.
-  manager()->PasswordFormsVisible(observed);  // The initial layout.
+  manager()->OnPasswordFormsFound(observed);  // The initial load.
+  manager()->OnPasswordFormsVisible(observed);  // The initial layout.
 
   manager()->ProvisionallySavePassword(form);
 
   // The form reappears, but is not visible in the layout:
-  manager()->PasswordFormsFound(observed);
+  manager()->OnPasswordFormsFound(observed);
   // No call to PasswordFormsVisible.
 
   // Expect info bar to appear:
   scoped_ptr<PasswordFormManager> form_to_save;
   EXPECT_CALL(delegate_, AddSavePasswordInfoBar(_))
       .WillOnce(WithArg<0>(SaveToScopedPtr(&form_to_save)));
 
   manager()->DidStopLoading();
 
   ASSERT_FALSE(NULL == form_to_save.get());
   EXPECT_CALL(*store_, AddLogin(FormMatches(form)));
   // Simulate saving the form.
   form_to_save->Save();
 }
 
 TEST_F(PasswordManagerTest, InitiallyInvisibleForm) {
   // Make sure an invisible login form still gets autofilled.
   std::vector<PasswordForm*> result;
   PasswordForm* existing = new PasswordForm(MakeSimpleForm());
   result.push_back(existing);
   EXPECT_CALL(delegate_, FillPasswordForm(_));
   EXPECT_CALL(*store_, GetLogins(_,_))
       .WillRepeatedly(DoAll(WithArg<1>(InvokeConsumer(0, result)), Return(0)));
   std::vector<PasswordForm> observed;
   PasswordForm form(MakeSimpleForm());
   observed.push_back(form);
-  manager()->PasswordFormsFound(observed);  // The initial load.
+  manager()->OnPasswordFormsFound(observed);  // The initial load.
   // PasswordFormsVisible is not called.
 
   manager()->DidStopLoading();
 }