Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(423)

Side by Side Diff: ios/chrome/browser/data_reduction_proxy/ios_chrome_data_reduction_proxy_settings.cc

Issue 1662843002: Revert of Delete base/prefs and update callers to use components. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ios/chrome/browser/data_reduction_proxy/ios_chrome_data_reduction_prox y_settings.h" 5 #include "ios/chrome/browser/data_reduction_proxy/ios_chrome_data_reduction_prox y_settings.h"
6 6
7 #include <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/base64.h" 10 #include "base/base64.h"
11 #include "base/memory/ref_counted.h" 11 #include "base/memory/ref_counted.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/metrics/histogram_macros.h" 13 #include "base/metrics/histogram_macros.h"
14 #include "base/prefs/pref_service.h"
15 #include "base/prefs/scoped_user_pref_update.h"
14 #include "base/strings/string_util.h" 16 #include "base/strings/string_util.h"
15 #include "base/time/time.h" 17 #include "base/time/time.h"
16 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_comp ression_stats.h" 18 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_comp ression_stats.h"
17 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_conf ig.h" 19 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_conf ig.h"
18 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_d ata.h" 20 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_d ata.h"
19 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_serv ice.h" 21 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_serv ice.h"
20 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_sett ings.h" 22 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_sett ings.h"
21 #include "components/data_reduction_proxy/core/browser/data_store.h" 23 #include "components/data_reduction_proxy/core/browser/data_store.h"
22 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_param s.h" 24 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_param s.h"
23 #include "components/prefs/pref_service.h"
24 #include "components/prefs/scoped_user_pref_update.h"
25 #include "components/proxy_config/proxy_config_pref_names.h" 25 #include "components/proxy_config/proxy_config_pref_names.h"
26 #include "components/proxy_config/proxy_prefs.h" 26 #include "components/proxy_config/proxy_prefs.h"
27 #include "ios/chrome/browser/metrics/ios_chrome_metrics_service_accessor.h" 27 #include "ios/chrome/browser/metrics/ios_chrome_metrics_service_accessor.h"
28 #include "ios/chrome/browser/pref_names.h" 28 #include "ios/chrome/browser/pref_names.h"
29 #include "net/base/host_port_pair.h" 29 #include "net/base/host_port_pair.h"
30 #include "net/proxy/proxy_config.h" 30 #include "net/proxy/proxy_config.h"
31 #include "net/proxy/proxy_list.h" 31 #include "net/proxy/proxy_list.h"
32 #include "net/proxy/proxy_server.h" 32 #include "net/proxy/proxy_server.h"
33 #include "net/url_request/url_request_context_getter.h" 33 #include "net/url_request/url_request_context_getter.h"
34 34
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 SetCallbackToRegisterSyntheticFieldTrial(base::Bind( 204 SetCallbackToRegisterSyntheticFieldTrial(base::Bind(
205 &IOSChromeMetricsServiceAccessor::RegisterSyntheticFieldTrial)); 205 &IOSChromeMetricsServiceAccessor::RegisterSyntheticFieldTrial));
206 // TODO(bengr): Remove after M46. See http://crbug.com/445599. 206 // TODO(bengr): Remove after M46. See http://crbug.com/445599.
207 MigrateDataReductionProxyOffProxyPrefs(profile_prefs); 207 MigrateDataReductionProxyOffProxyPrefs(profile_prefs);
208 } 208 }
209 209
210 // static 210 // static
211 data_reduction_proxy::Client IOSChromeDataReductionProxySettings::GetClient() { 211 data_reduction_proxy::Client IOSChromeDataReductionProxySettings::GetClient() {
212 return data_reduction_proxy::Client::CHROME_IOS; 212 return data_reduction_proxy::Client::CHROME_IOS;
213 } 213 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698