Move data_reduction_proxy_enabled pref to profile_impl_io_data.

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"
@@ skipping 97 matching lines @@
 #endif
     if (save_prefs)
       io_data_->predictor_->SaveStateForNextStartupAndTrim();
     io_data_->predictor_->ShutdownOnUIThread();
   }
 
   if (io_data_->http_server_properties_manager_)
     io_data_->http_server_properties_manager_->ShutdownOnPrefThread();
 
   io_data_->ShutdownOnUIThread(GetAllContextGetters().Pass());
+  io_data_->data_reduction_proxy_enabled()->Destroy();

[mmenke, 2014/10/09 14:49:35]

Think it's more consistent to do this before ShutdownOnUIThread (Shutdown the
class then shutdown its parent - that's how everything else is shutdown here)

[Not at Google. Contact bengr, 2014/10/09 22:24:41]

Done.

 }
 
 void ProfileImplIOData::Handle::Init(
     const base::FilePath& cookie_path,
     const base::FilePath& channel_id_path,
     const base::FilePath& cache_path,
     int cache_max_size,
     const base::FilePath& media_cache_path,
     int media_cache_max_size,
     const base::FilePath& extensions_cookie_path,
@@ skipping 198 matching lines @@
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(
           &ProfileImplIOData::ClearNetworkingHistorySinceOnIOThread,
           base::Unretained(io_data_),
           time,
           completion));
 }
 
 void ProfileImplIOData::Handle::LazyInitialize() const {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (initialized_)
     return;
 
   // Set initialized_ to true at the beginning in case any of the objects
   // below try to get the ResourceContext pointer.
   initialized_ = true;
   PrefService* pref_service = profile_->GetPrefs();
   io_data_->http_server_properties_manager_ =
       chrome_browser_net::HttpServerPropertiesManagerFactory::CreateManager(
           pref_service);
@@ skipping 85 matching lines @@
               BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO))));
   set_data_reduction_proxy_usage_stats(
       scoped_ptr<data_reduction_proxy::DataReductionProxyUsageStats>
           (new data_reduction_proxy::DataReductionProxyUsageStats(
               data_reduction_proxy_params(),
               BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI)
                   .get())));
   data_reduction_proxy_usage_stats()->set_unavailable_callback(
       data_reduction_proxy_unavailable_callback());
 
+  network_delegate()->set_data_reduction_proxy_enabled_pref(
+      &data_reduction_proxy_enabled_);
   network_delegate()->set_data_reduction_proxy_params(
       data_reduction_proxy_params());
   network_delegate()->set_data_reduction_proxy_usage_stats(
       data_reduction_proxy_usage_stats());
   network_delegate()->set_data_reduction_proxy_auth_request_handler(
       data_reduction_proxy_auth_request_handler());
   network_delegate()->set_data_reduction_proxy_statistics_prefs(
       data_reduction_proxy_statistics_prefs());
   network_delegate()->set_on_resolve_proxy_handler(
       base::Bind(data_reduction_proxy::OnResolveProxyHandler));
@@ skipping 372 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);
 }
+
+bool ProfileImplIOData::IsDataReductionProxyEnabled() const {
+  return data_reduction_proxy_enabled_.GetValue() ||
+         CommandLine::ForCurrentProcess()->HasSwitch(
+            data_reduction_proxy::switches::kEnableDataReductionProxy);
+}