Display the proxy PAC javascript errors in the NetLog....

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 437 matching lines @@
   static v8::Handle<v8::Value> MyIpAddressCallback(const v8::Arguments& args) {
     Context* context =
         static_cast<Context*>(v8::External::Cast(*args.Data())->Value());
 
     std::string result;
     bool success;
 
     {
       v8::Unlocker unlocker;
 
-      LogEventToCurrentRequest(context,
-                               NetLog::PHASE_BEGIN,
-                               NetLog::TYPE_PROXY_RESOLVER_V8_MY_IP_ADDRESS,
-                               NULL);
-
       // We shouldn't be called with any arguments, but will not complain if
       // we are.
       success = context->js_bindings_->MyIpAddress(&result);
-
-      LogEventToCurrentRequest(context,
-                               NetLog::PHASE_END,
-                               NetLog::TYPE_PROXY_RESOLVER_V8_MY_IP_ADDRESS,
-                               NULL);
     }
 
     if (!success)
       return ASCIILiteralToV8String("127.0.0.1");
     return ASCIIStringToV8String(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());
 
     std::string ip_address_list;
     bool success;
 
     {
       v8::Unlocker unlocker;
 
-      LogEventToCurrentRequest(context,
-                               NetLog::PHASE_BEGIN,
-                               NetLog::TYPE_PROXY_RESOLVER_V8_MY_IP_ADDRESS_EX,
-                               NULL);
-
       // We shouldn't be called with any arguments, but will not complain if
       // we are.
       success = context->js_bindings_->MyIpAddressEx(&ip_address_list);
-
-      LogEventToCurrentRequest(context,
-                               NetLog::PHASE_END,
-                               NetLog::TYPE_PROXY_RESOLVER_V8_MY_IP_ADDRESS_EX,
-                               NULL);
     }
 
     if (!success)
       ip_address_list = std::string();
     return ASCIIStringToV8String(ip_address_list);
   }
 
   // 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 string argument.
     std::string hostname;
     if (!GetHostnameArgument(args, &hostname))
       return v8::Null();
 
     std::string ip_address;
     bool success;
 
     {
       v8::Unlocker unlocker;
-
-      LogEventToCurrentRequest(context,
-                               NetLog::PHASE_BEGIN,
-                               NetLog::TYPE_PROXY_RESOLVER_V8_DNS_RESOLVE,
-                               NULL);
-
       success = context->js_bindings_->DnsResolve(hostname, &ip_address);
-
-      LogEventToCurrentRequest(context,
-                               NetLog::PHASE_END,
-                               NetLog::TYPE_PROXY_RESOLVER_V8_DNS_RESOLVE,
-                               NULL);
     }
 
     return success ? ASCIIStringToV8String(ip_address) : v8::Null();
   }
 
   // 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 string argument.
     std::string hostname;
     if (!GetHostnameArgument(args, &hostname))
       return v8::Undefined();
 
     std::string ip_address_list;
     bool success;
 
     {
       v8::Unlocker unlocker;
-
-      LogEventToCurrentRequest(context,
-                               NetLog::PHASE_BEGIN,
-                               NetLog::TYPE_PROXY_RESOLVER_V8_DNS_RESOLVE_EX,
-                               NULL);
-
       success = context->js_bindings_->DnsResolveEx(hostname,
                                                     &ip_address_list);
-
-      LogEventToCurrentRequest(context,
-                               NetLog::PHASE_END,
-                               NetLog::TYPE_PROXY_RESOLVER_V8_DNS_RESOLVE_EX,
-                               NULL);
     }
 
     if (!success)
       ip_address_list = std::string();
 
     return ASCIIStringToV8String(ip_address_list);
   }
 
-  static void LogEventToCurrentRequest(Context* context,
-                                       NetLog::EventPhase phase,
-                                       NetLog::EventType type,
-                                       NetLog::EventParameters* params) {
-    if (context->js_bindings_->current_request_context()) {
-      context->js_bindings_->current_request_context()->net_log->AddEntry(
-          type, phase, params);
-    }
-  }
-
   ProxyResolverJSBindings* js_bindings_;
   v8::Persistent<v8::External> v8_this_;
   v8::Persistent<v8::Context> v8_context_;
 };
 
 // ProxyResolverV8 ------------------------------------------------------------
 
 ProxyResolverV8::ProxyResolverV8(
     ProxyResolverJSBindings* custom_js_bindings)
     : ProxyResolver(true /*expects_pac_bytes*/),
@@ skipping 55 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