Initialize the new net internals page using the passively collected log entri...

chrome/browser/net/view_net_internals_job_factory.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 "chrome/browser/net/view_net_internals_job_factory.h"
 
 #include <sstream>
 
 #include "base/format_macros.h"
 #include "base/stl_util-inl.h"
@@ skipping 12 matching lines @@
 #include "net/socket_stream/socket_stream.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_simple_job.h"
 #include "net/url_request/view_cache_helper.h"
 
 namespace {
 
 const char kViewHttpCacheSubPath[] = "view-cache";
 
+// TODO(eroman): Delete this file. It should be replaced by
+//               chrome/browser/dom_ui/net_internals_ui.cc once the porting is
+//               complete.
+
 PassiveLogCollector* GetPassiveLogCollector(URLRequestContext* context) {
   // Really this is the same as:
   // g_browser_process->io_thread()->globals()->
   //     net_log.get()
   // (But we can't access g_browser_process from the IO thread).
   ChromeNetLog* chrome_net_log = static_cast<ChromeNetLog*>(
       static_cast<ChromeURLRequestContext*>(context)->net_log());
   return chrome_net_log->passive_collector();
 }
 
@@ skipping 17 matching lines @@
   size_t start = strlen(chrome::kNetworkViewInternalsURL);
   if (start >= url.spec().size())
     return std::string();
   return url.spec().substr(start);
 }
 
 GURL MakeURL(const std::string& details) {
   return GURL(std::string(chrome::kNetworkViewInternalsURL) + details);
 }
 
+// Converts a PassiveLogCollector::EntryList to a CapturingNetLog::EntryList.
+//
+// They are basically the same thing, except PassiveLogCollector has an extra
+// "order" field which we will drop.
+net::CapturingNetLog::EntryList ConvertEntryList(
+    const PassiveLogCollector::EntryList& input) {
+  net::CapturingNetLog::EntryList result;
+  for (size_t i = 0; i < input.size(); ++i) {
+    result.push_back(
+        net::CapturingNetLog::Entry(
+            input[i].type,
+            input[i].time,
+            input[i].source,
+            input[i].phase,
+            input[i].extra_parameters));
+  }
+  return result;
+}
+
 // A job subclass that implements a protocol to inspect the internal
 // state of the network stack.
 class ViewNetInternalsJob : public URLRequestSimpleJob {
  public:
 
   explicit ViewNetInternalsJob(URLRequest* request)
       : URLRequestSimpleJob(request) {}
 
   // URLRequestSimpleJob methods:
   virtual bool GetData(std::string* mime_type,
@@ skipping 172 matching lines @@
   }
 };
 
 class ProxyServiceLastInitLogSubSection : public SubSection {
  public:
   explicit ProxyServiceLastInitLogSubSection(SubSection* parent)
       : SubSection(parent, "init_log", "Last initialized load log") {
   }
 
   virtual void OutputBody(URLRequestContext* context, std::string* out) {
-    OutputTextInPre(net::NetLogUtil::PrettyPrintAsEventTree(
-        GetInitProxyResolverTracker(context)->entries(), 0), out);
+    OutputTextInPre(
+        net::NetLogUtil::PrettyPrintAsEventTree(
+            ConvertEntryList(GetInitProxyResolverTracker(context)->entries()),
+            0),
+        out);
   }
 };
 
 class ProxyServiceBadProxiesSubSection : public SubSection {
  public:
   explicit ProxyServiceBadProxiesSubSection(SubSection* parent)
       : SubSection(parent, "bad_proxies", "Bad Proxies") {
   }
 
   virtual void OutputBody(URLRequestContext* context, std::string* out) {
@@ skipping 199 matching lines @@
 
 // Helper for the URLRequest "outstanding" and "live" sections.
 void OutputURLAndLoadLog(const PassiveLogCollector::RequestInfo& request,
                          std::string* out) {
   out->append("<li>");
   out->append("<nobr>");
   out->append(EscapeForHTML(request.url));
   out->append("</nobr>");
   OutputTextInPre(
       net::NetLogUtil::PrettyPrintAsEventTree(
-          request.entries,
+          ConvertEntryList(request.entries),
           request.num_entries_truncated),
       out);
   out->append("</li>");
 }
 
 class URLRequestLiveSubSection : public SubSection {
  public:
   explicit URLRequestLiveSubSection(SubSection* parent)
       : SubSection(parent, "outstanding", "Outstanding requests") {
   }
@@ skipping 346 matching lines @@
   return StartsWithASCII(url.spec(),
                          chrome::kNetworkViewInternalsURL,
                          true /*case_sensitive*/);
 }
 
 // static
 URLRequestJob* ViewNetInternalsJobFactory::CreateJobForRequest(
     URLRequest* request) {
   return new ViewNetInternalsJob(request);
 }