Reduce the copying of string data between C++ and javascript in proxy_resolver_v8.cc.

net/proxy/proxy_script_fetcher_unittest.cc

Index: net/proxy/proxy_script_fetcher_unittest.cc
===================================================================
--- net/proxy/proxy_script_fetcher_unittest.cc	(revision 51195)
+++ net/proxy/proxy_script_fetcher_unittest.cc	(working copy)
@@ -24,7 +24,7 @@
 
 struct FetchResult {
   int code;
-  std::string bytes;
+  string16 text;
 };
 
 // A non-mock URL request which can access http:// and file:// urls.
@@ -70,22 +70,22 @@
       ProxyScriptFetcher::Create(context));
 
   { // Fetch a non-existent file.
-    std::string bytes;
+    string16 text;
     TestCompletionCallback callback;
     int result = pac_fetcher->Fetch(GetTestFileUrl("does-not-exist"),
-                                    &bytes, &callback);
+                                    &text, &callback);
     EXPECT_EQ(ERR_IO_PENDING, result);
     EXPECT_EQ(ERR_FILE_NOT_FOUND, callback.WaitForResult());
-    EXPECT_TRUE(bytes.empty());
+    EXPECT_TRUE(text.empty());
   }
   { // Fetch a file that exists.
-    std::string bytes;
+    string16 text;
     TestCompletionCallback callback;
     int result = pac_fetcher->Fetch(GetTestFileUrl("pac.txt"),
-                                    &bytes, &callback);
+                                    &text, &callback);
     EXPECT_EQ(ERR_IO_PENDING, result);
     EXPECT_EQ(OK, callback.WaitForResult());
-    EXPECT_EQ("-pac.txt-\n", bytes);
+    EXPECT_EQ(ASCIIToUTF16("-pac.txt-\n"), text);
   }
 }
 
@@ -101,30 +101,30 @@
 
   { // Fetch a PAC with mime type "text/plain"
     GURL url = server->TestServerPage("files/pac.txt");
-    std::string bytes;
+    string16 text;
     TestCompletionCallback callback;
-    int result = pac_fetcher->Fetch(url, &bytes, &callback);
+    int result = pac_fetcher->Fetch(url, &text, &callback);
     EXPECT_EQ(ERR_IO_PENDING, result);
     EXPECT_EQ(OK, callback.WaitForResult());
-    EXPECT_EQ("-pac.txt-\n", bytes);
+    EXPECT_EQ(ASCIIToUTF16("-pac.txt-\n"), text);
   }
   { // Fetch a PAC with mime type "text/html"
     GURL url = server->TestServerPage("files/pac.html");
-    std::string bytes;
+    string16 text;
     TestCompletionCallback callback;
-    int result = pac_fetcher->Fetch(url, &bytes, &callback);
+    int result = pac_fetcher->Fetch(url, &text, &callback);
     EXPECT_EQ(ERR_IO_PENDING, result);
     EXPECT_EQ(OK, callback.WaitForResult());
-    EXPECT_EQ("-pac.html-\n", bytes);
+    EXPECT_EQ(ASCIIToUTF16("-pac.html-\n"), text);
   }
   { // Fetch a PAC with mime type "application/x-ns-proxy-autoconfig"
     GURL url = server->TestServerPage("files/pac.nsproxy");
-    std::string bytes;
+    string16 text;
     TestCompletionCallback callback;
-    int result = pac_fetcher->Fetch(url, &bytes, &callback);
+    int result = pac_fetcher->Fetch(url, &text, &callback);
     EXPECT_EQ(ERR_IO_PENDING, result);
     EXPECT_EQ(OK, callback.WaitForResult());
-    EXPECT_EQ("-pac.nsproxy-\n", bytes);
+    EXPECT_EQ(ASCIIToUTF16("-pac.nsproxy-\n"), text);
   }
 }
 
@@ -138,21 +138,21 @@
 
   { // Fetch a PAC which gives a 500 -- FAIL
     GURL url = server->TestServerPage("files/500.pac");
-    std::string bytes;
+    string16 text;
     TestCompletionCallback callback;
-    int result = pac_fetcher->Fetch(url, &bytes, &callback);
+    int result = pac_fetcher->Fetch(url, &text, &callback);
     EXPECT_EQ(ERR_IO_PENDING, result);
     EXPECT_EQ(ERR_PAC_STATUS_NOT_OK, callback.WaitForResult());
-    EXPECT_TRUE(bytes.empty());
+    EXPECT_TRUE(text.empty());
   }
   { // Fetch a PAC which gives a 404 -- FAIL
     GURL url = server->TestServerPage("files/404.pac");
-    std::string bytes;
+    string16 text;
     TestCompletionCallback callback;
-    int result = pac_fetcher->Fetch(url, &bytes, &callback);
+    int result = pac_fetcher->Fetch(url, &text, &callback);
     EXPECT_EQ(ERR_IO_PENDING, result);
     EXPECT_EQ(ERR_PAC_STATUS_NOT_OK, callback.WaitForResult());
-    EXPECT_TRUE(bytes.empty());
+    EXPECT_TRUE(text.empty());
   }
 }
 
@@ -167,12 +167,12 @@
   // Fetch PAC scripts via HTTP with a Content-Disposition header -- should
   // have no effect.
   GURL url = server->TestServerPage("files/downloadable.pac");
-  std::string bytes;
+  string16 text;
   TestCompletionCallback callback;
-  int result = pac_fetcher->Fetch(url, &bytes, &callback);
+  int result = pac_fetcher->Fetch(url, &text, &callback);
   EXPECT_EQ(ERR_IO_PENDING, result);
   EXPECT_EQ(OK, callback.WaitForResult());
-  EXPECT_EQ("-downloadable.pac-\n", bytes);
+  EXPECT_EQ(ASCIIToUTF16("-downloadable.pac-\n"), text);
 }
 
 TEST_F(ProxyScriptFetcherTest, NoCache) {
@@ -186,12 +186,12 @@
   // Fetch a PAC script whose HTTP headers make it cacheable for 1 hour.
   GURL url = server->TestServerPage("files/cacheable_1hr.pac");
   {
-    std::string bytes;
+    string16 text;
     TestCompletionCallback callback;
-    int result = pac_fetcher->Fetch(url, &bytes, &callback);
+    int result = pac_fetcher->Fetch(url, &text, &callback);
     EXPECT_EQ(ERR_IO_PENDING, result);
     EXPECT_EQ(OK, callback.WaitForResult());
-    EXPECT_EQ("-cacheable_1hr.pac-\n", bytes);
+    EXPECT_EQ(ASCIIToUTF16("-cacheable_1hr.pac-\n"), text);
   }
 
   // Now kill the HTTP server.
@@ -202,9 +202,9 @@
   // running anymore. (If it were instead being loaded from cache, we would
   // get a success.
   {
-    std::string bytes;
+    string16 text;
     TestCompletionCallback callback;
-    int result = pac_fetcher->Fetch(url, &bytes, &callback);
+    int result = pac_fetcher->Fetch(url, &text, &callback);
     EXPECT_EQ(ERR_IO_PENDING, result);
     EXPECT_EQ(ERR_CONNECTION_REFUSED, callback.WaitForResult());
   }
@@ -231,12 +231,12 @@
   // after 50 bytes have been read, and fail with a too large error.
   for (size_t i = 0; i < arraysize(urls); ++i) {
     const GURL& url = urls[i];
-    std::string bytes;
+    string16 text;
     TestCompletionCallback callback;
-    int result = pac_fetcher->Fetch(url, &bytes, &callback);
+    int result = pac_fetcher->Fetch(url, &text, &callback);
     EXPECT_EQ(ERR_IO_PENDING, result);
     EXPECT_EQ(ERR_FILE_TOO_BIG, callback.WaitForResult());
-    EXPECT_TRUE(bytes.empty());
+    EXPECT_TRUE(text.empty());
   }
 
   // Restore the original size bound.
@@ -244,12 +244,12 @@
 
   { // Make sure we can still fetch regular URLs.
     GURL url = server->TestServerPage("files/pac.nsproxy");
-    std::string bytes;
+    string16 text;
     TestCompletionCallback callback;
-    int result = pac_fetcher->Fetch(url, &bytes, &callback);
+    int result = pac_fetcher->Fetch(url, &text, &callback);
     EXPECT_EQ(ERR_IO_PENDING, result);
     EXPECT_EQ(OK, callback.WaitForResult());
-    EXPECT_EQ("-pac.nsproxy-\n", bytes);
+    EXPECT_EQ(ASCIIToUTF16("-pac.nsproxy-\n"), text);
   }
 }
 
@@ -268,12 +268,12 @@
   // Try fetching a URL which takes 1.2 seconds. We should abort the request
   // after 500 ms, and fail with a timeout error.
   { GURL url = server->TestServerPage("slow/proxy.pac?1.2");
-    std::string bytes;
+    string16 text;
     TestCompletionCallback callback;
-    int result = pac_fetcher->Fetch(url, &bytes, &callback);
+    int result = pac_fetcher->Fetch(url, &text, &callback);
     EXPECT_EQ(ERR_IO_PENDING, result);
     EXPECT_EQ(ERR_TIMED_OUT, callback.WaitForResult());
-    EXPECT_TRUE(bytes.empty());
+    EXPECT_TRUE(text.empty());
   }
 
   // Restore the original timeout period.
@@ -281,12 +281,12 @@
 
   { // Make sure we can still fetch regular URLs.
     GURL url = server->TestServerPage("files/pac.nsproxy");
-    std::string bytes;
+    string16 text;
     TestCompletionCallback callback;
-    int result = pac_fetcher->Fetch(url, &bytes, &callback);
+    int result = pac_fetcher->Fetch(url, &text, &callback);
     EXPECT_EQ(ERR_IO_PENDING, result);
     EXPECT_EQ(OK, callback.WaitForResult());
-    EXPECT_EQ("-pac.nsproxy-\n", bytes);
+    EXPECT_EQ(ASCIIToUTF16("-pac.nsproxy-\n"), text);
   }
 }
 
@@ -304,24 +304,24 @@
   // Test a response that is gzip-encoded -- should get inflated.
   {
     GURL url = server->TestServerPage("files/gzipped_pac");
-    std::string bytes;
+    string16 text;
     TestCompletionCallback callback;
-    int result = pac_fetcher->Fetch(url, &bytes, &callback);
+    int result = pac_fetcher->Fetch(url, &text, &callback);
     EXPECT_EQ(ERR_IO_PENDING, result);
     EXPECT_EQ(OK, callback.WaitForResult());
-    EXPECT_EQ("This data was gzipped.\n", bytes);
+    EXPECT_EQ(ASCIIToUTF16("This data was gzipped.\n"), text);
   }
 
   // Test a response that was served as UTF-16 (BE). It should
   // be converted to UTF8.
   {
     GURL url = server->TestServerPage("files/utf16be_pac");
-    std::string bytes;
+    string16 text;
     TestCompletionCallback callback;
-    int result = pac_fetcher->Fetch(url, &bytes, &callback);
+    int result = pac_fetcher->Fetch(url, &text, &callback);
     EXPECT_EQ(ERR_IO_PENDING, result);
     EXPECT_EQ(OK, callback.WaitForResult());
-    EXPECT_EQ("This was encoded as UTF-16BE.\n", bytes);
+    EXPECT_EQ(ASCIIToUTF16("This was encoded as UTF-16BE.\n"), text);
   }
 }