Migrate data reduction proxy statistics prefs to profile

chrome/browser/profiles/profile_impl.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.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 64 matching lines @@
 #include "chrome/browser/ui/startup/startup_browser_creator.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths_internal.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/chromium_strings.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/data_reduction_proxy/browser/data_reduction_proxy_params.h"
+#include "components/data_reduction_proxy/browser/data_reduction_proxy_prefs.h"
 #include "components/data_reduction_proxy/browser/data_reduction_proxy_settings.h"
 #include "components/data_reduction_proxy/browser/data_reduction_proxy_statistics_prefs.h"
 #include "components/domain_reliability/monitor.h"
 #include "components/domain_reliability/service.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/metrics/metrics_service.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/startup_metric_utils/startup_metric_utils.h"
 #include "components/url_fixer/url_fixer.h"
 #include "components/user_prefs/user_prefs.h"
@@ skipping 565 matching lines @@
 #if defined(OS_ANDROID) || defined(OS_IOS)
   // On mobile we write data reduction proxy prefs directly to the pref service.
   // On desktop we store data reduction proxy prefs in memory, writing to disk
   // every 60 minutes and on termination. Shutdown hooks must be added for
   // Android and iOS in order for non-zero delays to be supported.
   // (http://crbug.com/408264)
   base::TimeDelta commit_delay = base::TimeDelta();
 #else
   base::TimeDelta commit_delay = base::TimeDelta::FromMinutes(60);
 #endif
+  data_reduction_proxy::MigrateStatisticsPrefs(g_browser_process->local_state(),
+                                               prefs_.get());

[mmenke, 2014/10/15 15:49:34]

Add a TODO, with a milestone, about when this can be removed (Could additionally
add it to the function declaration - think it may make sense to have it in both
places, to make sure it's removed).

[bengr, 2014/10/15 22:52:51]

Done.

   data_reduction_proxy_statistics_prefs =
       scoped_ptr<data_reduction_proxy::DataReductionProxyStatisticsPrefs>(
           new data_reduction_proxy::DataReductionProxyStatisticsPrefs(
-              g_browser_process->local_state(),
+              prefs_.get(),
               base::MessageLoopProxy::current(),
               commit_delay));
   data_reduction_proxy_chrome_settings->SetDataReductionProxyStatisticsPrefs(
       data_reduction_proxy_statistics_prefs.get());
 
   // Make sure we initialize the ProfileIOData after everything else has been
   // initialized that we might be reading from the IO thread.
 
   io_data_.Init(cookie_path, channel_id_path, cache_path,
                 cache_max_size, media_cache_path, media_cache_max_size,
@@ skipping 749 matching lines @@
 ProfileImpl::CreateDomainReliabilityMonitor(PrefService* local_state) {
   domain_reliability::DomainReliabilityService* service =
       domain_reliability::DomainReliabilityServiceFactory::GetInstance()->
           GetForBrowserContext(this);
   if (!service)
     return scoped_ptr<domain_reliability::DomainReliabilityMonitor>();
 
   return service->CreateMonitor(
       BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
 }