Move net-export thread-hopping code into NetLogFileWriter and add IO polled data.

net/log/write_to_file_net_log_observer.cc

 // Copyright 2013 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/log/write_to_file_net_log_observer.h"
 
 #include <stdio.h>
 
 #include <memory>
 #include <set>
@@ skipping 49 matching lines @@
     DCHECK(url_request_context->CalledOnValidThread());
 
     std::set<URLRequestContext*> contexts;
     contexts.insert(url_request_context);
     CreateNetLogEntriesForActiveObjects(contexts, this);
   }
 
   net_log->DeprecatedAddObserver(this, capture_mode_);
 }
 
-void WriteToFileNetLogObserver::StopObserving(
-    URLRequestContext* url_request_context) {
+void WriteToFileNetLogObserver::StopObserving(base::Value* polled_data) {
   net_log()->DeprecatedRemoveObserver(this);
 
   // End events array.
   fprintf(file_.get(), "]");
 
-  // Write state of the URLRequestContext when logging stopped.
-  if (url_request_context) {
-    DCHECK(url_request_context->CalledOnValidThread());
-
+  if (polled_data) {
     std::string json;
-    base::JSONWriter::Write(
-        *GetNetInfo(url_request_context, NET_INFO_ALL_SOURCES), &json);
-    fprintf(file_.get(), ",\"tabInfo\": %s\n", json.c_str());
+    base::JSONWriter::Write(*polled_data, &json);
+    fprintf(file_.get(), ",\"polledData\": %s\n", json.c_str());
   }
   fprintf(file_.get(), "}");
 
   file_.reset();
 }
 
 void WriteToFileNetLogObserver::OnAddEntry(const NetLogEntry& entry) {
   // Add a comma and newline for every event but the first.  Newlines are needed
   // so can load partial log files by just ignoring the last line.  For this to
   // work, lines cannot be pretty printed.
   std::unique_ptr<base::Value> value(entry.ToValue());
   std::string json;
   base::JSONWriter::Write(*value, &json);
   fprintf(file_.get(), "%s%s", (added_events_ ? ",\n" : ""), json.c_str());
   added_events_ = true;
 }
 
 }  // namespace net