Add the ability for DevTools to wrap network transactions.

chrome/browser/profiles/profile_io_data.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
 #define CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #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"
 #include "chrome/common/content_settings_types.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/resource_context.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/http/http_network_session.h"
 #include "net/url_request/url_request_job_factory.h"
 
@@ skipping 145 matching lines @@
   BooleanPrefMember* network_prediction_enabled() const {
     return &network_prediction_enabled_;
   }
 
   content::ResourceContext::SaltCallback GetMediaDeviceIDSalt() const;
 
   net::TransportSecurityState* transport_security_state() const {
     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_;
   }
 #endif
 
   bool is_incognito() const {
     return is_incognito_;
   }
 
@@ skipping 145 matching lines @@
 
   bool initialized() const {
     return initialized_;
   }
 
   // Destroys the ResourceContext first, to cancel any URLRequests that are
   // using it still, before we destroy the member variables that those
   // 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);
 
   void set_signin_names_for_testing(SigninNamesOnIOThread* signin_names);
 
  private:
   class ResourceContext : public content::ResourceContext {
    public:
     explicit ResourceContext(ProfileIOData* io_data);
     virtual ~ResourceContext();
@@ skipping 174 matching lines @@
 
   mutable scoped_refptr<HostContentSettingsMap> host_content_settings_map_;
 
   mutable scoped_ptr<ChromeHttpUserAgentSettings>
       chrome_http_user_agent_settings_;
 
 #if defined(ENABLE_MANAGED_USERS)
   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_;
 
   bool is_incognito_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileIOData);
 };
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_