Rename unused "SSL" related automation methods to be generic, since that's what these methods actually do, and so I can repurpose them for a different info-bar test.

BUG=none
TEST=none


Review URL: http://codereview.chromium.org/385029

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

3 files changed, 17 insertions, 18 deletions

diff --git a/chrome/test/automation/automation_messages_internal.h b/chrome/test/automation/automation_messages_internal.h
index d2f7458..754c335 100644
--- a/chrome/test/automation/automation_messages_internal.h
+++ b/chrome/test/automation/automation_messages_internal.h
@@ -773,16 +773,16 @@ IPC_BEGIN_MESSAGES(Automation)
                              bool, /* is_visible */
                              bool  /* still_animating */)
 
-  // This message requests the number of SSL related info bars opened.  It
+  // This message requests the number of related info bars opened.  It
   // returns -1 if an error occurred.
-  IPC_SYNC_MESSAGE_ROUTED1_1(AutomationMsg_GetSSLInfoBarCount,
+  IPC_SYNC_MESSAGE_ROUTED1_1(AutomationMsg_GetInfoBarCount,
                              int /* tab_handle */,
                              int /* info bar count */)
 
-  // This message triggers the action associated with the link in the info-bar
-  // at the specified index.  If |wait for navigation| is true, it won't return
-  // until a navigation has occurred.
-  IPC_SYNC_MESSAGE_ROUTED3_1(AutomationMsg_ClickSSLInfoBarLink,
+  // This message triggers the action associated with the "accept" button in
+  // the info-bar at the specified index.  If |wait for navigation| is true, it
+  // won't return until a navigation has occurred.
+  IPC_SYNC_MESSAGE_ROUTED3_1(AutomationMsg_ClickInfoBarAccept,
                              int /* tab_handle */,
                              int /* info bar index */,
                              bool /* wait for navigation */,
diff --git a/chrome/test/automation/tab_proxy.cc b/chrome/test/automation/tab_proxy.cc
index 43246ea..c16044f 100644
--- a/chrome/test/automation/tab_proxy.cc
+++ b/chrome/test/automation/tab_proxy.cc
@@ -611,22 +611,21 @@ void TabProxy::HandleMessageFromExternalHost(const std::string& message,
   DCHECK(succeeded);
 }
 
-bool TabProxy::GetSSLInfoBarCount(int* count) {
+bool TabProxy::GetInfoBarCount(int* count) {
   if (!is_valid())
     return false;
 
-  return sender_->Send(new AutomationMsg_GetSSLInfoBarCount(0, handle_,
-                                                            count));
+  return sender_->Send(new AutomationMsg_GetInfoBarCount(0, handle_, count));
 }
 
-bool TabProxy::ClickSSLInfoBarLink(int info_bar_index,
-                                   bool wait_for_navigation) {
+bool TabProxy::ClickInfoBarAccept(int info_bar_index,
+                                  bool wait_for_navigation) {
   if (!is_valid())
     return false;
 
   AutomationMsg_NavigationResponseValues result =
       AUTOMATION_MSG_NAVIGATION_ERROR;
-  sender_->Send(new AutomationMsg_ClickSSLInfoBarLink(
+  sender_->Send(new AutomationMsg_ClickInfoBarAccept(
       0, handle_, info_bar_index, wait_for_navigation, &result));
   return result == AUTOMATION_MSG_NAVIGATION_SUCCESS ||
       result == AUTOMATION_MSG_NAVIGATION_AUTH_NEEDED;
diff --git a/chrome/test/automation/tab_proxy.h b/chrome/test/automation/tab_proxy.h
index 7693e60..9a5be9c 100644
--- a/chrome/test/automation/tab_proxy.h
+++ b/chrome/test/automation/tab_proxy.h
@@ -315,13 +315,13 @@ class TabProxy : public AutomationResourceProxy {
                                      const std::string& origin,
                                      const std::string& target);
 
-  // Retrieves the number of SSL related info-bars currently showing in |count|.
-  bool GetSSLInfoBarCount(int* count);
+  // Retrieves the number of info-bars currently showing in |count|.
+  bool GetInfoBarCount(int* count);
 
-  // Causes a click on the link of the info-bar at |info_bar_index|.  If
-  // |wait_for_navigation| is true, this call does not return until a navigation
-  // has occured.
-  bool ClickSSLInfoBarLink(int info_bar_index, bool wait_for_navigation);
+  // Causes a click on the "accept" button of the info-bar at |info_bar_index|.
+  // If |wait_for_navigation| is true, this call does not return until a
+  // navigation has occured.
+  bool ClickInfoBarAccept(int info_bar_index, bool wait_for_navigation);
 
   // Retrieves the time at which the last navigation occured.  This is intended
   // to be used with WaitForNavigation (see below).