Add the ability for DevTools to wrap network transactions.

chrome/browser/profiles/profile_io_data.h

Index: chrome/browser/profiles/profile_io_data.h
diff --git a/chrome/browser/profiles/profile_io_data.h b/chrome/browser/profiles/profile_io_data.h
index 467513c2de5c92b09c1eddddb2cb688e9ceb71e9..c423df53d05515c557a1617919afba50d7337c68 100644
--- a/chrome/browser/profiles/profile_io_data.h
+++ b/chrome/browser/profiles/profile_io_data.h
@@ -16,6 +16,7 @@
 #include "base/prefs/pref_member.h"
 #include "base/synchronization/lock.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
+#include "chrome/browser/devtools/devtools_network_controller.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/profiles/storage_partition_descriptor.h"
@@ -181,6 +182,10 @@ class ProfileIOData {
     return transport_security_state_.get();
   }
 
+  DevToolsNetworkController* devtools_network_controller() const {
+    return devtools_network_controller_.get();
+  }

[mmenke, 2014/03/07 19:38:08]

How's this going to be used?

[eustas, 2014/03/11 12:06:42]

This will be used to communicate with controller from devtools.

+
 #if defined(OS_CHROMEOS)
   std::string username_hash() const {
     return username_hash_;
@@ -346,11 +351,14 @@ class ProfileIOData {
   // URLRequests may be accessing.
   void DestroyResourceContext();
 
-  // Fills in fields of params using values from main_request_context_ and the
-  // IOThread associated with profile_params.
-  void PopulateNetworkSessionParams(
-      const ProfileParams* profile_params,
-      net::HttpNetworkSession::Params* params) const;
+  // Creates network session and network transaction factory.
+  void InitializeNetworkTransactionFactory(
+      const ProfileParams* profile_params) const;
+
+  net::HttpTransactionFactory* network_transaction_factory() const {

[mmenke, 2014/03/07 19:38:08]

Who's going to need access to this?

[eustas, 2014/03/11 12:06:42]

this is protected method, so it is used by profile & offline profile io data
impls.

Removed.

+    return static_cast<net::HttpTransactionFactory*>(
+        devtools_network_controller_.get());

[mmenke, 2014/03/07 19:38:08]

static cast not needed, if DevtoolsNetworkController is a child of
HttpTransactionFactory.  Also, who's going to need this?

[eustas, 2014/03/11 12:06:42]

This method was added to encapsulate the nature of constructed transaction
factory. profile_io_data implementations shouldn't know about it.

Removed.

+  }
 
   void SetCookieSettingsForTesting(CookieSettings* cookie_settings);
 
@@ -545,6 +553,8 @@ class ProfileIOData {
   mutable scoped_refptr<const ManagedModeURLFilter> managed_mode_url_filter_;
 #endif
 
+  mutable scoped_ptr<DevToolsNetworkController> devtools_network_controller_;

[mmenke, 2014/03/07 19:38:08]

The HttpCache will take ownership of the HttpTransactionFactory, so this should
not be a scoped_ptr.

[eustas, 2014/03/11 12:06:42]

Oops, didn't notice.

Fixed.

+
   // TODO(jhawkins): Remove once crbug.com/102004 is fixed.
   bool initialized_on_UI_thread_;