Generalize the net module's LoadLog facility from a passive container, to an event stream (NetLog).

net/proxy/proxy_resolver_v8.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.
+// 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/logging.h"
 #include "base/string_util.h"
 #include "googleurl/src/gurl.h"
-#include "net/base/load_log.h"
 #include "net/base/net_errors.h"
+#include "net/base/net_log.h"
 #include "net/proxy/proxy_info.h"
 #include "net/proxy/proxy_resolver_js_bindings.h"
 #include "net/proxy/proxy_resolver_script.h"
 #include "v8/include/v8.h"
 
 // Notes on the javascript environment:
 //
 // For the majority of the PAC utility functions, we use the same code
 // as Firefox. See the javascript library that proxy_resolver_scipt.h
 // pulls in.
@@ skipping 73 matching lines @@
   return true;
 }
 
 }  // namespace
 
 // ProxyResolverV8::Context ---------------------------------------------------
 
 class ProxyResolverV8::Context {
  public:
   explicit Context(ProxyResolverJSBindings* js_bindings)
-      : js_bindings_(js_bindings), current_request_load_log_(NULL) {
+      : js_bindings_(js_bindings), current_request_net_log_(NULL) {
     DCHECK(js_bindings != NULL);
   }
 
   ~Context() {
     v8::Locker locked;
 
     v8_this_.Dispose();
     v8_context_.Dispose();
   }
 
@@ skipping 91 matching lines @@
 
     // At a minimum, the FindProxyForURL() function must be defined for this
     // to be a legitimiate PAC script.
     v8::Local<v8::Value> function;
     if (!GetFindProxyForURL(&function))
       return ERR_PAC_SCRIPT_FAILED;
 
     return OK;
   }
 
-  void SetCurrentRequestLoadLog(LoadLog* load_log) {
-    current_request_load_log_ = load_log;
+  void SetCurrentRequestNetLog(BoundNetLog* net_log) {
+    current_request_net_log_ = net_log;
   }
 
   void PurgeMemory() {
     v8::Locker locked;
     // Repeatedly call the V8 idle notification until it returns true ("nothing
     // more to free").  Note that it makes more sense to do this than to
     // implement a new "delete everything" pass because object references make
     // it difficult to free everything possible in just one pass.
     while (!v8::V8::IdleNotification())
       ;
@@ skipping 57 matching lines @@
 
     context->js_bindings_->Alert(message);
     return v8::Undefined();
   }
 
   // V8 callback for when "myIpAddress()" is invoked by the PAC script.
   static v8::Handle<v8::Value> MyIpAddressCallback(const v8::Arguments& args) {
     Context* context =
         static_cast<Context*>(v8::External::Cast(*args.Data())->Value());
 
-    LoadLog::BeginEvent(context->current_request_load_log_,
-                        LoadLog::TYPE_PROXY_RESOLVER_V8_MY_IP_ADDRESS);
+    context->current_request_net_log_->BeginEvent(
+        NetLog::TYPE_PROXY_RESOLVER_V8_MY_IP_ADDRESS);
 
     // We shouldn't be called with any arguments, but will not complain if
     // we are.
     std::string result = context->js_bindings_->MyIpAddress();
 
-    LoadLog::EndEvent(context->current_request_load_log_,
-                      LoadLog::TYPE_PROXY_RESOLVER_V8_MY_IP_ADDRESS);
+    context->current_request_net_log_->EndEvent(
+        NetLog::TYPE_PROXY_RESOLVER_V8_MY_IP_ADDRESS);
 
     if (result.empty())
       result = "127.0.0.1";
     return StdStringToV8String(result);
   }
 
   // V8 callback for when "myIpAddressEx()" is invoked by the PAC script.
   static v8::Handle<v8::Value> MyIpAddressExCallback(
       const v8::Arguments& args) {
     Context* context =
         static_cast<Context*>(v8::External::Cast(*args.Data())->Value());
 
-    LoadLog::BeginEvent(context->current_request_load_log_,
-                        LoadLog::TYPE_PROXY_RESOLVER_V8_MY_IP_ADDRESS_EX);
+    context->current_request_net_log_->BeginEvent(
+        NetLog::TYPE_PROXY_RESOLVER_V8_MY_IP_ADDRESS_EX);
 
     // We shouldn't be called with any arguments, but will not complain if
     // we are.
     std::string result = context->js_bindings_->MyIpAddressEx();
 
-    LoadLog::EndEvent(context->current_request_load_log_,
-                      LoadLog::TYPE_PROXY_RESOLVER_V8_MY_IP_ADDRESS_EX);
+    context->current_request_net_log_->EndEvent(
+        NetLog::TYPE_PROXY_RESOLVER_V8_MY_IP_ADDRESS_EX);
 
     return StdStringToV8String(result);
   }
 
   // V8 callback for when "dnsResolve()" is invoked by the PAC script.
   static v8::Handle<v8::Value> DnsResolveCallback(const v8::Arguments& args) {
     Context* context =
         static_cast<Context*>(v8::External::Cast(*args.Data())->Value());
 
     // We need at least one argument.
     std::string host;
     if (args.Length() == 0) {
       host = "undefined";
     } else {
       if (!V8ObjectToString(args[0], &host))
         return v8::Undefined();
     }
 
-    LoadLog::BeginEvent(context->current_request_load_log_,
-                        LoadLog::TYPE_PROXY_RESOLVER_V8_DNS_RESOLVE);
+    context->current_request_net_log_->BeginEvent(
+        NetLog::TYPE_PROXY_RESOLVER_V8_DNS_RESOLVE);
 
     std::string result = context->js_bindings_->DnsResolve(host);
 
-    LoadLog::EndEvent(context->current_request_load_log_,
-                      LoadLog::TYPE_PROXY_RESOLVER_V8_DNS_RESOLVE);
+    context->current_request_net_log_->EndEvent(
+        NetLog::TYPE_PROXY_RESOLVER_V8_DNS_RESOLVE);
 
     // DnsResolve() returns empty string on failure.
     return result.empty() ? v8::Null() : StdStringToV8String(result);
   }
 
   // V8 callback for when "dnsResolveEx()" is invoked by the PAC script.
   static v8::Handle<v8::Value> DnsResolveExCallback(const v8::Arguments& args) {
     Context* context =
         static_cast<Context*>(v8::External::Cast(*args.Data())->Value());
 
     // We need at least one argument.
     std::string host;
     if (args.Length() == 0) {
       host = "undefined";
     } else {
       if (!V8ObjectToString(args[0], &host))
         return v8::Undefined();
     }
 
-    LoadLog::BeginEvent(context->current_request_load_log_,
-                        LoadLog::TYPE_PROXY_RESOLVER_V8_DNS_RESOLVE_EX);
+    context->current_request_net_log_->BeginEvent(
+        NetLog::TYPE_PROXY_RESOLVER_V8_DNS_RESOLVE_EX);
 
     std::string result = context->js_bindings_->DnsResolveEx(host);
 
-    LoadLog::EndEvent(context->current_request_load_log_,
-                      LoadLog::TYPE_PROXY_RESOLVER_V8_DNS_RESOLVE_EX);
+    context->current_request_net_log_->EndEvent(
+        NetLog::TYPE_PROXY_RESOLVER_V8_DNS_RESOLVE_EX);
 
     return StdStringToV8String(result);
   }
 
   ProxyResolverJSBindings* js_bindings_;
-  LoadLog* current_request_load_log_;
+  BoundNetLog* current_request_net_log_;
   v8::Persistent<v8::External> v8_this_;
   v8::Persistent<v8::Context> v8_context_;
 };
 
 // ProxyResolverV8 ------------------------------------------------------------
 
 ProxyResolverV8::ProxyResolverV8(
     ProxyResolverJSBindings* custom_js_bindings)
     : ProxyResolver(true /*expects_pac_bytes*/),
       js_bindings_(custom_js_bindings) {
 }
 
 ProxyResolverV8::~ProxyResolverV8() {}
 
 int ProxyResolverV8::GetProxyForURL(const GURL& query_url,
                                     ProxyInfo* results,
                                     CompletionCallback* /*callback*/,
                                     RequestHandle* /*request*/,
-                                    LoadLog* load_log) {
+                                    const BoundNetLog& net_log) {
   // If the V8 instance has not been initialized (either because
   // SetPacScript() wasn't called yet, or because it failed.
   if (!context_.get())
     return ERR_FAILED;
 
+  BoundNetLog log(net_log);
+
   // Otherwise call into V8.
-  context_->SetCurrentRequestLoadLog(load_log);
+  context_->SetCurrentRequestNetLog(&log);
   int rv = context_->ResolveProxy(query_url, results);
-  context_->SetCurrentRequestLoadLog(NULL);
+  context_->SetCurrentRequestNetLog(NULL);
 
   return rv;
 }
 
 void ProxyResolverV8::CancelRequest(RequestHandle request) {
   // This is a synchronous ProxyResolver; no possibility for async requests.
   NOTREACHED();
 }
 
 void ProxyResolverV8::PurgeMemory() {
   context_->PurgeMemory();
 }
 
 int ProxyResolverV8::SetPacScript(const GURL& /*url*/,
                                   const std::string& bytes_utf8,
                                   CompletionCallback* /*callback*/) {
   context_.reset();
   if (bytes_utf8.empty())
     return ERR_PAC_SCRIPT_FAILED;
 
   // Try parsing the PAC script.
   scoped_ptr<Context> context(new Context(js_bindings_.get()));
   int rv = context->InitV8(bytes_utf8);
   if (rv == OK)
     context_.reset(context.release());
   return rv;
 }
 
 }  // namespace net