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

chrome/browser/password_manager/password_manager_unittest.cc

Index: chrome/browser/password_manager/password_manager_unittest.cc
===================================================================
--- chrome/browser/password_manager/password_manager_unittest.cc	(revision 71973)
+++ chrome/browser/password_manager/password_manager_unittest.cc	(working copy)
@@ -137,8 +137,8 @@
   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);
@@ -172,8 +172,8 @@
   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.
@@ -196,8 +196,8 @@
   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();
 
@@ -213,14 +213,14 @@
   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();
@@ -236,13 +236,13 @@
   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:
@@ -269,7 +269,7 @@
   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();