Set trusted SPDY proxy dynamically on per-profile basis

chrome/browser/profiles/profile_io_data.cc

 // 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.
 
 #include "chrome/browser/profiles/profile_io_data.h"
 
 #include <stddef.h>
-#include <string>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/debug/alias.h"
 #include "base/logging.h"
 #include "base/macros.h"
@@ skipping 48 matching lines @@
 #include "components/url_formatter/url_fixer.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/host_zoom_map.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/resource_context.h"
 #include "net/base/keygen_handler.h"
 #include "net/base/network_quality_estimator.h"
 #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"
 #include "net/proxy/proxy_config_service_fixed.h"
 #include "net/proxy/proxy_script_fetcher_impl.h"
 #include "net/proxy/proxy_service.h"
 #include "net/ssl/channel_id_service.h"
 #include "net/ssl/client_cert_store.h"
 #include "net/url_request/certificate_report_sender.h"
 #include "net/url_request/data_protocol_handler.h"
@@ skipping 1204 matching lines @@
 
   IOThread* const io_thread = profile_params.io_thread;
 
   io_thread->InitializeNetworkSessionParams(&params);
   net::URLRequestContextBuilder::SetHttpNetworkSessionComponents(context,
                                                                  &params);
   if (!IsOffTheRecord()) {
     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();
 
   return scoped_ptr<net::HttpNetworkSession>(
       new net::HttpNetworkSession(params));
 }
 
 scoped_ptr<net::HttpCache> ProfileIOData::CreateMainHttpFactory(
     net::HttpNetworkSession* session,
     scoped_ptr<net::HttpCache::BackendFactory> main_backend) const {
@@ skipping 10 matching lines @@
       make_scoped_ptr(new DevToolsNetworkTransactionFactory(
           network_controller_handle_.GetController(), shared_session)),
       std::move(backend), true /* set_up_quic_server_info */));
 }
 
 void ProfileIOData::SetCookieSettingsForTesting(
     content_settings::CookieSettings* cookie_settings) {
   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.

+  }
+}