summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-04 18:14:11 +0000
committereroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-04 18:14:11 +0000
commitb02d89c3004cffd1e8a31432520f1ea97a6bc58e (patch)
treea6832be8fd2db23a8c27b18d1ca4defbe80a83f9
parent391e6b7176174c3c8622b37340282e70e8bd2883 (diff)
downloadchromium_src-b02d89c3004cffd1e8a31432520f1ea97a6bc58e.zip
chromium_src-b02d89c3004cffd1e8a31432520f1ea97a6bc58e.tar.gz
chromium_src-b02d89c3004cffd1e8a31432520f1ea97a6bc58e.tar.bz2
Remove some unused NetLog event types.
These were obsoleted by r179714 BUG=119151 Review URL: https://chromiumcodereview.appspot.com/12092121 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180449 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--net/base/net_log_event_type_list.h18
-rw-r--r--net/proxy/multi_threaded_proxy_resolver_unittest.cc2
2 files changed, 6 insertions, 14 deletions
diff --git a/net/base/net_log_event_type_list.h b/net/base/net_log_event_type_list.h
index 10fa5c4..050bd24 100644
--- a/net/base/net_log_event_type_list.h
+++ b/net/base/net_log_event_type_list.h
@@ -285,21 +285,9 @@ EVENT_TYPE(BAD_PROXY_LIST_REPORTED)
EVENT_TYPE(PROXY_LIST_FALLBACK)
// ------------------------------------------------------------------------
-// Proxy Resolver
+// ProxyResolverV8Tracing
// ------------------------------------------------------------------------
-// Measures the time taken to execute the "myIpAddress()" javascript binding.
-EVENT_TYPE(PAC_JAVASCRIPT_MY_IP_ADDRESS)
-
-// Measures the time taken to execute the "myIpAddressEx()" javascript binding.
-EVENT_TYPE(PAC_JAVASCRIPT_MY_IP_ADDRESS_EX)
-
-// Measures the time taken to execute the "dnsResolve()" javascript binding.
-EVENT_TYPE(PAC_JAVASCRIPT_DNS_RESOLVE)
-
-// Measures the time taken to execute the "dnsResolveEx()" javascript binding.
-EVENT_TYPE(PAC_JAVASCRIPT_DNS_RESOLVE_EX)
-
// This event is emitted when a javascript error has been triggered by a
// PAC script. It contains the following event parameters:
// {
@@ -316,6 +304,10 @@ EVENT_TYPE(PAC_JAVASCRIPT_ERROR)
// }
EVENT_TYPE(PAC_JAVASCRIPT_ALERT)
+// ------------------------------------------------------------------------
+// MultiThreadedProxyResolver
+// ------------------------------------------------------------------------
+
// Measures the time that a proxy resolve request was stalled waiting for a
// proxy resolver thread to free-up.
EVENT_TYPE(WAITING_FOR_PROXY_RESOLVER_THREAD)
diff --git a/net/proxy/multi_threaded_proxy_resolver_unittest.cc b/net/proxy/multi_threaded_proxy_resolver_unittest.cc
index bb856bd..6a74ca9 100644
--- a/net/proxy/multi_threaded_proxy_resolver_unittest.cc
+++ b/net/proxy/multi_threaded_proxy_resolver_unittest.cc
@@ -49,7 +49,7 @@ class MockProxyResolver : public ProxyResolver {
EXPECT_TRUE(request == NULL);
// Write something into |net_log| (doesn't really have any meaning.)
- net_log.BeginEvent(NetLog::TYPE_PAC_JAVASCRIPT_DNS_RESOLVE);
+ net_log.BeginEvent(NetLog::TYPE_PAC_JAVASCRIPT_ALERT);
results->UseNamedProxy(query_url.host());