Avoid using BrowserThread and ContentBrowserClient in NetLogObserver.

content/browser/loader/netlog_observer.h

Index: content/browser/loader/netlog_observer.h
diff --git a/content/browser/loader/netlog_observer.h b/content/browser/loader/netlog_observer.h
index 330a502e50afd7643ac8a5acb1e2d22f858d3c59..0c8b620544eb0252bc2431db8bc83ebd1251ad8b 100644
--- a/content/browser/loader/netlog_observer.h
+++ b/content/browser/loader/netlog_observer.h
@@ -8,8 +8,10 @@
 #include <stdint.h>
 
 #include "base/containers/hash_tables.h"
+#include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
+#include "base/single_thread_task_runner.h"
 #include "content/public/common/resource_devtools_info.h"
 #include "net/log/net_log.h"
 
@@ -36,7 +38,8 @@ class NetLogObserver : public net::NetLog::ThreadSafeObserver {
 
   void OnAddURLRequestEntry(const net::NetLog::Entry& entry);
 
-  static void Attach();
+  // The NetLog instance is passed in via the |net_log| parameter.
+  static void Attach(net::NetLog* net_log);
   static void Detach();
 
   // Must be called on the IO thread. May return NULL if no observers
@@ -44,6 +47,10 @@ class NetLogObserver : public net::NetLog::ThreadSafeObserver {
   static NetLogObserver* GetInstance();
   static void PopulateResponseInfo(net::URLRequest*, ResourceResponse*);
 
+  // The IO thread task runner is passed in via this function.
+  static void SetIOThreadTaskRunner(
+      scoped_refptr<base::SingleThreadTaskRunner> io_thread_runner);
+
  private:
   static NetLogObserver* instance_;
 
@@ -56,6 +63,10 @@ class NetLogObserver : public net::NetLog::ThreadSafeObserver {
       RequestToInfoMap;
   RequestToInfoMap request_to_info_;
 
+  // Contains the IO thread task runner instance.
+  static base::LazyInstance<scoped_refptr<base::SingleThreadTaskRunner>>::Leaky
+      io_thread_task_runner_;
+
   DISALLOW_COPY_AND_ASSIGN(NetLogObserver);
 };