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

net/proxy/single_threaded_proxy_resolver.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/single_threaded_proxy_resolver.h"
 
 #include "base/message_loop.h"
 #include "base/thread.h"
 #include "net/base/capturing_net_log.h"
 #include "net/base/net_errors.h"
@@ skipping 17 matching lines @@
 
 // SingleThreadedProxyResolver::SetPacScriptTask ------------------------------
 
 // Runs on the worker thread to call ProxyResolver::SetPacScript.
 class SingleThreadedProxyResolver::SetPacScriptTask
     : public base::RefCountedThreadSafe<
         SingleThreadedProxyResolver::SetPacScriptTask> {
  public:
   SetPacScriptTask(SingleThreadedProxyResolver* coordinator,
                    const GURL& pac_url,
-                   const std::string& pac_bytes,
+                   const string16& pac_script,
                    CompletionCallback* callback)
     : coordinator_(coordinator),
       callback_(callback),
-      pac_bytes_(pac_bytes),
+      pac_script_(pac_script),
       pac_url_(pac_url),
       origin_loop_(MessageLoop::current()) {
     DCHECK(callback);
   }
 
   // Start the SetPacScript request on the worker thread.
   void Start() {
     coordinator_->thread()->message_loop()->PostTask(
         FROM_HERE, NewRunnableMethod(this, &SetPacScriptTask::DoRequest,
         coordinator_->resolver_.get()));
@@ skipping 11 matching lines @@
 
  private:
   friend class base::RefCountedThreadSafe<
         SingleThreadedProxyResolver::SetPacScriptTask>;
 
   ~SetPacScriptTask() {}
 
   // Runs on the worker thread.
   void DoRequest(ProxyResolver* resolver) {
     int rv = resolver->expects_pac_bytes() ?
-        resolver->SetPacScriptByData(pac_bytes_, NULL) :
+        resolver->SetPacScriptByData(pac_script_, NULL) :
         resolver->SetPacScriptByUrl(pac_url_, NULL);
 
     DCHECK_NE(rv, ERR_IO_PENDING);
     origin_loop_->PostTask(FROM_HERE,
         NewRunnableMethod(this, &SetPacScriptTask::RequestComplete, rv));
   }
 
   // Runs the completion callback on the origin thread.
   void RequestComplete(int result_code) {
     // The task may have been cancelled after it was started.
     if (!was_cancelled()) {
       CompletionCallback* callback = callback_;
       coordinator_->RemoveOutstandingSetPacScriptTask(this);
       callback->Run(result_code);
     }
   }
 
   // Must only be used on the "origin" thread.
   SingleThreadedProxyResolver* coordinator_;
   CompletionCallback* callback_;
-  std::string pac_bytes_;
+  string16 pac_script_;
   GURL pac_url_;
 
   // Usable from within DoQuery on the worker thread.
   MessageLoop* origin_loop_;
 };
 
 // SingleThreadedProxyResolver::Job -------------------------------------------
 
 class SingleThreadedProxyResolver::Job
     : public base::RefCountedThreadSafe<SingleThreadedProxyResolver::Job> {
@@ skipping 187 matching lines @@
 void SingleThreadedProxyResolver::PurgeMemory() {
   if (thread_.get()) {
     scoped_refptr<PurgeMemoryTask> helper(new PurgeMemoryTask(resolver_.get()));
     thread_->message_loop()->PostTask(FROM_HERE,
         NewRunnableMethod(helper.get(), &PurgeMemoryTask::PurgeMemory));
   }
 }
 
 int SingleThreadedProxyResolver::SetPacScript(
     const GURL& pac_url,
-    const std::string& pac_bytes,
+    const string16& pac_script,
     CompletionCallback* callback) {
   EnsureThreadStarted();
   DCHECK(!outstanding_set_pac_script_task_);
 
   SetPacScriptTask* task = new SetPacScriptTask(
-      this, pac_url, pac_bytes, callback);
+      this, pac_url, pac_script, callback);
   outstanding_set_pac_script_task_ = task;
   task->Start();
   return ERR_IO_PENDING;
 }
 
 void SingleThreadedProxyResolver::EnsureThreadStarted() {
   if (!thread_.get()) {
     thread_.reset(new base::Thread("pac-thread"));
     thread_->Start();
   }
@@ skipping 24 matching lines @@
   ProcessPendingJobs();
 }
 
 void SingleThreadedProxyResolver::RemoveOutstandingSetPacScriptTask(
     SetPacScriptTask* task) {
   DCHECK_EQ(outstanding_set_pac_script_task_.get(), task);
   outstanding_set_pac_script_task_ = NULL;
 }
 
 }  // namespace net