2 files changed, 12 insertions, 7 deletions
diff --git a/chrome_frame/test/test_server.cc b/chrome_frame/test/test_server.cc
index 942333a..88672b8 100644
--- a/chrome_frame/test/test_server.cc
+++ b/chrome_frame/test/test_server.cc
@@ -172,11 +172,13 @@ void SimpleWebServer::DidAccept(ListenSocket* server,
 }
 
 void SimpleWebServer::DidRead(ListenSocket* connection,
-                              const std::string& data) {
+                              const char* data,
+                              int len) {
   Connection* c = FindConnection(connection);
   DCHECK(c);
   Request& r = c->request();
-  r.OnDataReceived(data);
+  std::string str(data, len);
+  r.OnDataReceived(str);
   if (r.AllContentReceived()) {
     const Request& request = c->request();
     Response* response = FindResponse(request);
@@ -247,11 +249,14 @@ void HTTPTestServer::DidAccept(ListenSocket* server, ListenSocket* socket) {
   connection_list_.push_back(new ConfigurableConnection(socket));
 }
 
-void HTTPTestServer::DidRead(ListenSocket* socket, const std::string& data) {
+void HTTPTestServer::DidRead(ListenSocket* socket,
+                             const char* data,
+                             int len) {
   scoped_refptr<ConfigurableConnection> connection =
       ConnectionFromSocket(socket);
   if (connection) {
-    connection->r_.OnDataReceived(data);
+    std::string str(data, len);
+    connection->r_.OnDataReceived(str);
     if (connection->r_.AllContentReceived()) {
       if (LowerCaseEqualsASCII(connection->r_.method(), "post"))
         this->Post(connection, connection->r_.path(), connection->r_);
diff --git a/chrome_frame/test/test_server.h b/chrome_frame/test/test_server.h
index b827ceb..c3fab96 100644
--- a/chrome_frame/test/test_server.h
+++ b/chrome_frame/test/test_server.h
@@ -288,7 +288,7 @@ class SimpleWebServer : public ListenSocket::ListenSocketDelegate {
 
   // ListenSocketDelegate overrides.
   virtual void DidAccept(ListenSocket* server, ListenSocket* connection);
-  virtual void DidRead(ListenSocket* connection, const std::string& data);
+  virtual void DidRead(ListenSocket* connection, const char* data, int len);
   virtual void DidClose(ListenSocket* sock);
 
   const ConnectionList& connections() const {
@@ -381,7 +381,7 @@ class HTTPTestServer : public ListenSocket::ListenSocketDelegate {
   virtual void Post(ConfigurableConnection* connection,
                     const std::string& path, const Request& r) = 0;
 
-private:
+ private:
   typedef std::list<scoped_refptr<ConfigurableConnection> > ConnectionList;
   ConnectionList::iterator FindConnection(const ListenSocket* socket);
   scoped_refptr<ConfigurableConnection> ConnectionFromSocket(
@@ -389,7 +389,7 @@ private:
 
   // ListenSocketDelegate overrides.
   virtual void DidAccept(ListenSocket* server, ListenSocket* socket);
-  virtual void DidRead(ListenSocket* socket, const std::string& data);
+  virtual void DidRead(ListenSocket* socket, const char* data, int len);
   virtual void DidClose(ListenSocket* socket);
 
   scoped_refptr<ListenSocket> server_;