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

net/proxy/proxy_script_fetcher_unittest.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/proxy/proxy_script_fetcher.h"
 
 #include "base/file_path.h"
 #include "base/compiler_specific.h"
 #include "base/path_service.h"
 #include "net/base/net_util.h"
 #include "net/base/ssl_config_service_defaults.h"
 #include "net/base/test_completion_callback.h"
 #include "net/disk_cache/disk_cache.h"
 #include "net/http/http_cache.h"
 #include "net/url_request/url_request_unittest.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 // TODO(eroman):
 //   - Test canceling an outstanding request.
 //   - Test deleting ProxyScriptFetcher while a request is in progress.
 
 const wchar_t kDocRoot[] = L"net/data/proxy_script_fetcher_unittest";
 
 struct FetchResult {
   int code;
-  std::string bytes;
+  string16 text;
 };
 
 // A non-mock URL request which can access http:// and file:// urls.
 class RequestContext : public URLRequestContext {
  public:
   RequestContext() {
     net::ProxyConfig no_proxy;
     host_resolver_ = net::CreateSystemHostResolver();
     proxy_service_ = net::ProxyService::CreateFixed(no_proxy);
     ssl_config_service_ = new net::SSLConfigServiceDefaults;
@@ skipping 25 matching lines @@
 }
 
 typedef PlatformTest ProxyScriptFetcherTest;
 
 TEST_F(ProxyScriptFetcherTest, FileUrl) {
   scoped_refptr<URLRequestContext> context = new RequestContext;
   scoped_ptr<ProxyScriptFetcher> pac_fetcher(
       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);
   }
 }
 
 // Note that all mime types are allowed for PAC file, to be consistent
 // with other browsers.
 TEST_F(ProxyScriptFetcherTest, HttpMimeType) {
   scoped_refptr<HTTPTestServer> server =
       HTTPTestServer::CreateServer(kDocRoot, NULL);
   ASSERT_TRUE(NULL != server.get());
   scoped_refptr<URLRequestContext> context = new RequestContext;
   scoped_ptr<ProxyScriptFetcher> pac_fetcher(
       ProxyScriptFetcher::Create(context));
 
   { // 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);
   }
 }
 
 TEST_F(ProxyScriptFetcherTest, HttpStatusCode) {
   scoped_refptr<HTTPTestServer> server =
       HTTPTestServer::CreateServer(kDocRoot, NULL);
   ASSERT_TRUE(NULL != server.get());
   scoped_refptr<URLRequestContext> context = new RequestContext;
   scoped_ptr<ProxyScriptFetcher> pac_fetcher(
       ProxyScriptFetcher::Create(context));
 
   { // 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());
   }
 }
 
 TEST_F(ProxyScriptFetcherTest, ContentDisposition) {
   scoped_refptr<HTTPTestServer> server =
       HTTPTestServer::CreateServer(kDocRoot, NULL);
   ASSERT_TRUE(NULL != server.get());
   scoped_refptr<URLRequestContext> context = new RequestContext;
   scoped_ptr<ProxyScriptFetcher> pac_fetcher(
       ProxyScriptFetcher::Create(context));
 
   // 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) {
   scoped_refptr<HTTPTestServer> server =
       HTTPTestServer::CreateServer(kDocRoot, NULL);
   ASSERT_TRUE(NULL != server.get());
   scoped_refptr<URLRequestContext> context = new RequestContext;
   scoped_ptr<ProxyScriptFetcher> pac_fetcher(
       ProxyScriptFetcher::Create(context));
 
   // 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.
   EXPECT_TRUE(server->Stop());  // Verify it shutdown synchronously.
   server = NULL;
 
   // Try to fetch the file again -- if should fail, since the server is not
   // 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());
   }
 }
 
 TEST_F(ProxyScriptFetcherTest, TooLarge) {
   scoped_refptr<HTTPTestServer> server =
       HTTPTestServer::CreateServer(kDocRoot, NULL);
   ASSERT_TRUE(NULL != server.get());
   scoped_refptr<URLRequestContext> context = new RequestContext;
   scoped_ptr<ProxyScriptFetcher> pac_fetcher(
       ProxyScriptFetcher::Create(context));
 
   // Set the maximum response size to 50 bytes.
   int prev_size = ProxyScriptFetcher::SetSizeConstraintForUnittest(50);
 
   // These two URLs are the same file, but are http:// vs file://
   GURL urls[] = {
     server->TestServerPage("files/large-pac.nsproxy"),
     GetTestFileUrl("large-pac.nsproxy")
   };
 
   // Try fetching URLs that are 101 bytes large. We should abort the request
   // 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.
   ProxyScriptFetcher::SetSizeConstraintForUnittest(prev_size);
 
   { // 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);
   }
 }
 
 TEST_F(ProxyScriptFetcherTest, Hang) {
   scoped_refptr<HTTPTestServer> server =
       HTTPTestServer::CreateServer(kDocRoot, NULL);
   ASSERT_TRUE(NULL != server.get());
   scoped_refptr<URLRequestContext> context = new RequestContext;
   scoped_ptr<ProxyScriptFetcher> pac_fetcher(
       ProxyScriptFetcher::Create(context));
 
   // Set the timeout period to 0.5 seconds.
   int prev_timeout =
       ProxyScriptFetcher::SetTimeoutConstraintForUnittest(500);
 
   // 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.
   ProxyScriptFetcher::SetTimeoutConstraintForUnittest(prev_timeout);
 
   { // 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);
   }
 }
 
 // The ProxyScriptFetcher should decode any content-codings
 // (like gzip, bzip, etc.), and apply any charset conversions to yield
 // UTF8.
 TEST_F(ProxyScriptFetcherTest, Encodings) {
   scoped_refptr<HTTPTestServer> server =
       HTTPTestServer::CreateServer(kDocRoot, NULL);
   ASSERT_TRUE(NULL != server.get());
   scoped_refptr<URLRequestContext> context = new RequestContext;
   scoped_ptr<ProxyScriptFetcher> pac_fetcher(
       ProxyScriptFetcher::Create(context));
 
   // 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);
   }
 }
 
 }  // namespace net