Remove round trip from data reduction proxy authentication

chrome/browser/profiles/profile_impl_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_impl_io_data.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
 #include "base/prefs/pref_member.h"
 #include "base/prefs/pref_service.h"
 #include "base/sequenced_task_runner.h"
 #include "base/stl_util.h"
 #include "base/string_util.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/threading/worker_pool.h"
+#if defined(OS_ANDROID)

[Yaron, 2013/05/21 18:04:30]

Conditional if-defs go at the bottom

[bengr, 2013/05/22 19:03:15]

Done.

+#include "chrome/app/android/chrome_data_reduction_proxy_android.h"
+#endif
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/net/chrome_net_log.h"
 #include "chrome/browser/net/chrome_network_delegate.h"
 #include "chrome/browser/net/connect_interceptor.h"
 #include "chrome/browser/net/http_server_properties_manager.h"
 #include "chrome/browser/net/predictor.h"
 #include "chrome/browser/net/sqlite_server_bound_cert_store.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 382 matching lines @@
           ChooseCacheBackendType(),
           lazy_params_->cache_path,
           lazy_params_->cache_max_size,
           BrowserThread::GetMessageLoopProxyForThread(BrowserThread::CACHE));
   net::HttpNetworkSession::Params network_session_params;
   PopulateNetworkSessionParams(profile_params, &network_session_params);
   net::HttpCache* main_cache = new net::HttpCache(
       network_session_params, main_backend);
   main_cache->InitializeInfiniteCache(lazy_params_->infinite_cache_path);
 
+#if defined(OS_ANDROID)
+  scoped_ptr<ChromeDataReductionProxyAndroid> chrome_data_reduction_proxy(
+      ChromeDataReductionProxyAndroid::Create());
+  chrome_data_reduction_proxy->Init(main_cache->GetSession());
+#endif

[mmenke, 2013/05/22 15:55:50]

Is there a reason not to just do this all in a static function?

[bengr, 2013/05/22 19:03:15]

I was imagining that ChromeDataReductionProxy would eventually construct
credentials for challenges as well, and would cache the results. This CL doesn't
require the objects, so I'm happy to modify the code if you think that's best.
Let me know.

[mmenke, 2013/05/22 19:20:12]

Since this is an "eventually", and it currently seems a little weird as-is,
let's just switch to a static function for now.

+
   if (record_mode || playback_mode) {
     main_cache->set_mode(
         record_mode ? net::HttpCache::RECORD : net::HttpCache::PLAYBACK);
   }
 
   main_http_factory_.reset(main_cache);
   main_context->set_http_transaction_factory(main_cache);
 
 #if !defined(DISABLE_FTP_SUPPORT)
   ftp_factory_.reset(
@@ skipping 251 matching lines @@
     const base::Closure& completion) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK(initialized());
 
   DCHECK(transport_security_state());
   // Completes synchronously.
   transport_security_state()->DeleteAllDynamicDataSince(time);
   DCHECK(http_server_properties_manager_);
   http_server_properties_manager_->Clear(completion);
 }