Move DevToolsNetLogObserver to c/b/loader and create stub of network service interface

content/browser/loader/netlog_observer.h

Index: content/browser/loader/netlog_observer.h
diff --git a/content/browser/devtools/devtools_netlog_observer.h b/content/browser/loader/netlog_observer.h
similarity index 52%
rename from content/browser/devtools/devtools_netlog_observer.h
rename to content/browser/loader/netlog_observer.h
index cde0133bc292f7fe932194c08e824db884c3a504..8ad38c0bc8baa0fa8faaa8f0dfb405c2af8aa6ca 100644
--- a/content/browser/devtools/devtools_netlog_observer.h
+++ b/content/browser/loader/netlog_observer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_BROWSER_DEVTOOLS_DEVTOOLS_NETLOG_OBSERVER_H_
-#define CONTENT_BROWSER_DEVTOOLS_DEVTOOLS_NETLOG_OBSERVER_H_
+#ifndef CONTENT_BROWSER_LOADER_NETLOG_OBSERVER_H_
+#define CONTENT_BROWSER_LOADER_NETLOG_OBSERVER_H_
 
 #include <stdint.h>
 
@@ -20,14 +20,14 @@ class URLRequest;
 namespace content {
 struct ResourceResponse;
 
-// DevToolsNetLogObserver watches the NetLog event stream and collects the
-// stuff that may be of interest to DevTools. Currently, this only includes
-// actual HTTP/SPDY headers sent and received over the network.
+// NetLogObserver watches the NetLog event stream and collects the stuff that
+// may be of interest to DevTools. Currently, this only includes actual

[jam, 2016/05/05 22:19:02]

nit: rename devtools to say something like client?

[scottmg, 2016/05/05 22:24:29]

Oops, done.

+// HTTP/SPDY headers sent and received over the network.
 //
-// As DevToolsNetLogObserver shares live data with objects that live on the
-// IO Thread, it must also reside on the IO Thread.  Only OnAddEntry can be
-// called from other threads.
-class DevToolsNetLogObserver : public net::NetLog::ThreadSafeObserver {
+// As NetLogObserver shares live data with objects that live on the IO Thread,
+// it must also reside on the IO Thread.  Only OnAddEntry can be called from
+// other threads.
+class NetLogObserver : public net::NetLog::ThreadSafeObserver {
   typedef ResourceDevToolsInfo ResourceInfo;
 
  public:
@@ -41,15 +41,14 @@ class DevToolsNetLogObserver : public net::NetLog::ThreadSafeObserver {
 
   // Must be called on the IO thread. May return NULL if no observers
   // are active.
-  static DevToolsNetLogObserver* GetInstance();
-  static void PopulateResponseInfo(net::URLRequest*,
-                                   ResourceResponse*);
+  static NetLogObserver* GetInstance();
+  static void PopulateResponseInfo(net::URLRequest*, ResourceResponse*);
 
  private:
-  static DevToolsNetLogObserver* instance_;
+  static NetLogObserver* instance_;
 
-  DevToolsNetLogObserver();
-  ~DevToolsNetLogObserver() override;
+  NetLogObserver();
+  ~NetLogObserver() override;
 
   ResourceInfo* GetResourceInfo(uint32_t id);
 
@@ -57,9 +56,9 @@ class DevToolsNetLogObserver : public net::NetLog::ThreadSafeObserver {
       RequestToInfoMap;
   RequestToInfoMap request_to_info_;
 
-  DISALLOW_COPY_AND_ASSIGN(DevToolsNetLogObserver);
+  DISALLOW_COPY_AND_ASSIGN(NetLogObserver);
 };
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_DEVTOOLS_DEVTOOLS_NETLOG_OBSERVER_H_
+#endif  // CONTENT_BROWSER_LOADER_NETLOG_OBSERVER_H_