Re-enable use of external string resources in ProxyResolverV8....

net/proxy/proxy_resolver_v8.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_resolver_v8.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 123 matching lines @@
  private:
   const std::string ascii_;
   DISALLOW_COPY_AND_ASSIGN(V8ExternalASCIIString);
 };
 
 // When creating a v8::String from a C++ string we have two choices: create
 // a copy, or create a wrapper that shares the same underlying storage.
 // For small strings it is better to just make a copy, whereas for large
 // strings there are savings by sharing the storage. This number identifies
 // the cutoff length for when to start wrapping rather than creating copies.
-// TODO(eroman): This is disabled because of crbug.com/48145.
-const size_t kMaxStringBytesForCopy = static_cast<size_t>(-1);
+const size_t kMaxStringBytesForCopy = 256;
 
 // Converts a V8 String to a UTF16 string16.
 string16 V8StringToUTF16(v8::Handle<v8::String> s) {
   int len = s->Length();
   string16 result;
   // Note that the reinterpret cast is because on Windows string16 is an alias
   // to wstring, and hence has character type wchar_t not uint16_t.
   s->Write(reinterpret_cast<uint16_t*>(WriteInto(&result, len + 1)), 0, len);
   return result;
 }
@@ skipping 83 matching lines @@
   explicit Context(ProxyResolverJSBindings* js_bindings)
       : js_bindings_(js_bindings) {
     DCHECK(js_bindings != NULL);
   }
 
   ~Context() {
     v8::Locker locked;
 
     v8_this_.Dispose();
     v8_context_.Dispose();
+
+    // Run the V8 garbage collector. We do this to be sure the
+    // ExternalStringResource objects we allocated get properly disposed.
+    // Otherwise when running the unit-tests they may get leaked.
+    // See crbug.com/48145.
+    PurgeMemory();
   }
 
   int ResolveProxy(const GURL& query_url, ProxyInfo* results) {
     v8::Locker locked;
     v8::HandleScope scope;
 
     v8::Context::Scope function_scope(v8_context_);
 
     v8::Local<v8::Value> function;
     if (!GetFindProxyForURL(&function)) {
@@ skipping 385 matching lines @@
 
   // Try parsing the PAC script.
   scoped_ptr<Context> context(new Context(js_bindings_.get()));
   int rv = context->InitV8(pac_script);
   if (rv == OK)
     context_.reset(context.release());
   return rv;
 }
 
 }  // namespace net