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

net/proxy/proxy_resolver_v8_unittest.cc

 // Copyright (c) 2009 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 "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_log_unittest.h"
@@ skipping 91 matching lines @@
     std::string file_contents;
     bool ok = file_util::ReadFileToString(path, &file_contents);
 
     // If we can't load the file from disk, something is misconfigured.
     if (!ok) {
       LOG(ERROR) << "Failed to read file: " << path.value();
       return ERR_UNEXPECTED;
     }
 
     // Load the PAC script into the ProxyResolver.
-    return SetPacScriptByData(file_contents, NULL);
+    return SetPacScriptByData(UTF8ToUTF16(file_contents), NULL);
   }
 };
 
 // Doesn't really matter what these values are for many of the tests.
 const GURL kQueryUrl("http://www.google.com");
 const GURL kPacUrl;
 
 
 TEST(ProxyResolverV8Test, Direct) {
   ProxyResolverV8WithMockBindings resolver;
@@ skipping 236 matching lines @@
   // Initialize it.
   result = resolver.SetPacScriptFromDisk("direct.js");
   EXPECT_EQ(OK, result);
 
   // Resolve should now succeed.
   result = resolver.GetProxyForURL(kQueryUrl, &proxy_info, NULL, NULL,
                                    BoundNetLog());
   EXPECT_EQ(OK, result);
 
   // Clear it, by initializing with an empty string.
-  resolver.SetPacScriptByData(std::string(), NULL);
+  resolver.SetPacScriptByData(string16(), NULL);
 
   // Resolve should fail again now.
   result = resolver.GetProxyForURL(kQueryUrl, &proxy_info, NULL, NULL,
                                    BoundNetLog());
   EXPECT_EQ(ERR_FAILED, result);
 
   // Load a good script once more.
   result = resolver.SetPacScriptFromDisk("direct.js");
   EXPECT_EQ(OK, result);
   result = resolver.GetProxyForURL(kQueryUrl, &proxy_info, NULL, NULL,
@@ skipping 187 matching lines @@
 
   ASSERT_EQ(1u, bindings->dns_resolves.size());
   EXPECT_EQ("xn--bcher-kva.ch", bindings->dns_resolves[0]);
 
   ASSERT_EQ(1u, bindings->dns_resolves_ex.size());
   EXPECT_EQ("xn--bcher-kva.ch", bindings->dns_resolves_ex[0]);
 }
 
 }  // namespace
 }  // namespace net