1 files changed, 22 insertions, 11 deletions

diff --git a/chrome/browser/dom_ui/net_internals_ui.cc b/chrome/browser/dom_ui/net_internals_ui.cc
index ffdb9a1..93e1262 100644
--- a/chrome/browser/dom_ui/net_internals_ui.cc
+++ b/chrome/browser/dom_ui/net_internals_ui.cc
@@ -45,11 +45,7 @@
 #include "net/http/http_cache.h"
 #include "net/http/http_network_layer.h"
 #include "net/http/http_network_session.h"
-#include "net/http/http_proxy_client_socket_pool.h"
 #include "net/proxy/proxy_service.h"
-#include "net/socket/socks_client_socket_pool.h"
-#include "net/socket/ssl_client_socket_pool.h"
-#include "net/socket/tcp_client_socket_pool.h"
 #include "net/url_request/url_request_context.h"
 #ifdef OS_WIN
 #include "chrome/browser/net/service_providers_win.h"
@@ -57,11 +53,6 @@
 
 namespace {
 
-// Formats |t| as a decimal number, in milliseconds.
-std::string TickCountToString(const base::TimeTicks& t) {
-  return base::Int64ToString((t - base::TimeTicks()).InMilliseconds());
-}
-
 // Returns the HostCache for |context|'s primary HostResolver, or NULL if
 // there is none.
 net::HostCache* GetHostResolverCache(URLRequestContext* context) {
@@ -214,6 +205,7 @@ class NetInternalsMessageHandler::IOThreadImpl
   void OnStartConnectionTests(const ListValue* list);
   void OnGetHttpCacheInfo(const ListValue* list);
   void OnGetSocketPoolInfo(const ListValue* list);
+  void OnGetSpdySessionInfo(const ListValue* list);
 #ifdef OS_WIN
   void OnGetServiceProviders(const ListValue* list);
 #endif
@@ -403,6 +395,9 @@ void NetInternalsMessageHandler::RegisterMessages() {
   dom_ui_->RegisterMessageCallback(
       "getSocketPoolInfo",
       proxy_->CreateCallback(&IOThreadImpl::OnGetSocketPoolInfo));
+  dom_ui_->RegisterMessageCallback(
+      "getSpdySessionInfo",
+      proxy_->CreateCallback(&IOThreadImpl::OnGetSpdySessionInfo));
 #ifdef OS_WIN
   dom_ui_->RegisterMessageCallback(
       "getServiceProviders",
@@ -610,6 +605,7 @@ void NetInternalsMessageHandler::IOThreadImpl::OnRendererReady(
   OnGetHostResolverInfo(NULL);
   OnGetHttpCacheInfo(NULL);
   OnGetSocketPoolInfo(NULL);
+  OnGetSpdySessionInfo(NULL);
 #ifdef OS_WIN
   OnGetServiceProviders(NULL);
 #endif
@@ -654,7 +650,8 @@ void NetInternalsMessageHandler::IOThreadImpl::OnGetBadProxies(
 
     DictionaryValue* dict = new DictionaryValue();
     dict->SetString("proxy_uri", proxy_uri);
-    dict->SetString("bad_until", TickCountToString(retry_info.bad_until));
+    dict->SetString("bad_until",
+                    net::NetLog::TickCountToString(retry_info.bad_until));
 
     dict_list->Append(dict);
   }
@@ -715,7 +712,8 @@ void NetInternalsMessageHandler::IOThreadImpl::OnGetHostResolverInfo(
     entry_dict->SetString("hostname", key.hostname);
     entry_dict->SetInteger("address_family",
         static_cast<int>(key.address_family));
-    entry_dict->SetString("expiration", TickCountToString(entry->expiration));
+    entry_dict->SetString("expiration",
+                          net::NetLog::TickCountToString(entry->expiration));
 
     if (entry->error != net::OK) {
       entry_dict->SetInteger("error", entry->error);
@@ -837,6 +835,19 @@ void NetInternalsMessageHandler::IOThreadImpl::OnGetSocketPoolInfo(
   CallJavascriptFunction(L"g_browser.receivedSocketPoolInfo", socket_pool_info);
 }
 
+void NetInternalsMessageHandler::IOThreadImpl::OnGetSpdySessionInfo(
+    const ListValue* list) {
+  net::HttpNetworkSession* http_network_session =
+      GetHttpNetworkSession(context_getter_->GetURLRequestContext());
+
+  Value* spdy_info = NULL;
+  if (http_network_session) {
+    spdy_info = http_network_session->SpdySessionPoolInfoToValue();
+  }
+
+  CallJavascriptFunction(L"g_browser.receivedSpdySessionInfo", spdy_info);
+}
+
 #ifdef OS_WIN
 void NetInternalsMessageHandler::IOThreadImpl::OnGetServiceProviders(
     const ListValue* list) {