Set trusted SPDY proxy dynamically on per-profile basis

chrome/browser/profiles/profile_io_data.cc

Index: chrome/browser/profiles/profile_io_data.cc
diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
index 20d93b9a2c49d8247c1d0c1e70ce7f27e9f92ba4..e9de499476469bbd393dcb3e5c6919b0092cb083 100644
--- a/chrome/browser/profiles/profile_io_data.cc
+++ b/chrome/browser/profiles/profile_io_data.cc
@@ -5,7 +5,6 @@
 #include "chrome/browser/profiles/profile_io_data.h"
 
 #include <stddef.h>
-#include <string>
 #include <utility>
 
 #include "base/bind.h"
@@ -74,7 +73,6 @@
 #include "net/cert/cert_verifier.h"
 #include "net/cert/multi_log_ct_verifier.h"
 #include "net/cookies/canonical_cookie.h"
-#include "net/http/http_network_session.h"
 #include "net/http/http_transaction_factory.h"
 #include "net/http/http_util.h"
 #include "net/http/transport_security_persister.h"
@@ -1299,6 +1297,8 @@ scoped_ptr<net::HttpNetworkSession> ProfileIOData::CreateHttpNetworkSession(
     params.socket_performance_watcher_factory =
         io_thread->globals()->network_quality_estimator.get();
   }
+  SetProxyDelegate(profile_params, &params);
+
   if (data_reduction_proxy_io_data_.get())
     params.proxy_delegate = data_reduction_proxy_io_data_->proxy_delegate();
 
@@ -1329,3 +1329,19 @@ void ProfileIOData::SetCookieSettingsForTesting(
   DCHECK(!cookie_settings_.get());
   cookie_settings_ = cookie_settings;
 }
+
+void ProfileIOData::SetProxyDelegate(

[bengr, 2016/01/26 19:39:55]

Line 1302 already does this, so remove this method.

[tbansal1, 2016/01/27 00:13:33]

Obsolete.

+    const ProfileParams& profile_params,
+    net::HttpNetworkSession::Params* params) const {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  DCHECK(!params->proxy_delegate);
+
+  if (IsOffTheRecord())

[bengr, 2016/01/26 19:39:55]

Can you implement this in ProfileImplIOData instead so you don't need to do this
check?

[tbansal1, 2016/01/27 00:13:33]

Obsolete.

+    return;
+
+  // Set proxy_delegate to Data Reduction Proxy.

[bengr, 2016/01/26 19:39:55]

Proxy -> Proxy's

[tbansal1, 2016/01/27 00:13:33]

Obsolete.

+  if (data_reduction_proxy_io_data()) {
+    params->proxy_delegate = data_reduction_proxy_io_data()->proxy_delegate();
+    return;

[bengr, 2016/01/26 19:39:55]

Remove the return and the curly braces.

[tbansal1, 2016/01/27 00:13:33]

Obsolete.

+  }
+}