Fix for the HTTPSGetTest and GetTest net test failures with ChromeFrame. These failures occurred

because of new expectations in these tests which match the server ip address and port being
connected to. We need to return that information from ChromeFrame.

Fix is to send over the corresponding HostPortPair structure in the AutomationMsg_RequestStarted
IPC message. A major part of this CL is basically the groundwork to pass this information over
via automation.

BUG=none
TEST=chrome frame net tests should pass.

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

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

1 files changed, 12 insertions, 9 deletions

diff --git a/chrome/common/automation_messages.cc b/chrome/common/automation_messages.cc
index 8dcac0e..f5f1ccc 100644
--- a/chrome/common/automation_messages.cc
+++ b/chrome/common/automation_messages.cc
@@ -5,7 +5,6 @@
 #define IPC_MESSAGE_IMPL
 #include "chrome/common/automation_messages.h"
 
-
 AutomationURLRequest::AutomationURLRequest()
     : resource_type(0),
       load_flags(0) {
@@ -35,18 +34,18 @@ AutomationURLResponse::AutomationURLResponse()
       redirect_status(0) {
 }
 
-AutomationURLResponse::AutomationURLResponse(const std::string& in_mime_type,
-                                             const std::string& in_headers,
-                                             int64 in_content_length,
-                                             const base::Time& in_last_modified,
-                                             const std::string& in_redirect_url,
-                                             int in_redirect_status)
+AutomationURLResponse::AutomationURLResponse(
+    const std::string& in_mime_type, const std::string& in_headers,
+    int64 in_content_length, const base::Time& in_last_modified,
+    const std::string& in_redirect_url, int in_redirect_status,
+    const net::HostPortPair& host_socket_address)
     : mime_type(in_mime_type),
       headers(in_headers),
       content_length(in_content_length),
       last_modified(in_last_modified),
       redirect_url(in_redirect_url),
-      redirect_status(in_redirect_status) {
+      redirect_status(in_redirect_status),
+      socket_address(host_socket_address) {
 }
 
 
@@ -445,6 +444,7 @@ void ParamTraits<AutomationURLResponse>::Write(Message* m,
   WriteParam(m, p.last_modified);
   WriteParam(m, p.redirect_url);
   WriteParam(m, p.redirect_status);
+  WriteParam(m, p.socket_address);
 }
 
 // static
@@ -456,7 +456,8 @@ bool ParamTraits<AutomationURLResponse>::Read(const Message* m,
       ReadParam(m, iter, &p->content_length) &&
       ReadParam(m, iter, &p->last_modified) &&
       ReadParam(m, iter, &p->redirect_url) &&
-      ReadParam(m, iter, &p->redirect_status);
+      ReadParam(m, iter, &p->redirect_status) &&
+      ReadParam(m, iter, &p->socket_address);
 }
 
 // static
@@ -474,6 +475,8 @@ void ParamTraits<AutomationURLResponse>::Log(const param_type& p,
   LogParam(p.redirect_url, l);
   l->append(", ");
   LogParam(p.redirect_status, l);
+  l->append(", ");
+  LogParam(p.socket_address, l);
   l->append(")");
 }