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

Side by Side Diff: chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_factory.cc

Issue 412143009: Moved data reduction proxy initialization logic to ProfileImplIOData (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 5 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "chrome/browser/net/spdyproxy/data_reduction_proxy_settings_factory_and roid.h" 5 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_fact ory.h"
6
7 #include "base/bind.h"
6 #include "base/memory/singleton.h" 8 #include "base/memory/singleton.h"
7 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.h" 9 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h"
8 #include "chrome/browser/profiles/profile.h" 10 #include "components/data_reduction_proxy/browser/data_reduction_proxy_params.h"
9 #include "components/data_reduction_proxy/browser/data_reduction_proxy_settings. h" 11 #include "components/data_reduction_proxy/browser/data_reduction_proxy_usage_sta ts.h"
10 #include "components/keyed_service/content/browser_context_dependency_manager.h" 12 #include "components/keyed_service/content/browser_context_dependency_manager.h"
11 #include "components/keyed_service/content/browser_context_keyed_service_factory .h" 13 #include "components/keyed_service/content/browser_context_keyed_service_factory .h"
14 #include "content/public/browser/browser_thread.h"
15
16 using content::BrowserThread;
17 using data_reduction_proxy::DataReductionProxyParams;
18 using data_reduction_proxy::DataReductionProxyUsageStats;
12 19
13 // static 20 // static
14 DataReductionProxySettingsAndroid* 21 DataReductionProxyChromeSettings*
15 DataReductionProxySettingsFactoryAndroid::GetForBrowserContext( 22 DataReductionProxyChromeSettingsFactory::GetForBrowserContext(
16 content::BrowserContext* context) { 23 content::BrowserContext* context) {
17 return static_cast<DataReductionProxySettingsAndroid*>( 24 return static_cast<DataReductionProxyChromeSettings*>(
18 GetInstance()->GetServiceForBrowserContext(context, true)); 25 GetInstance()->GetServiceForBrowserContext(context, true));
19 } 26 }
20 27
21 // static 28 // static
22 bool DataReductionProxySettingsFactoryAndroid:: 29 bool
23 HasDataReductionProxySettingsAndroid( 30 DataReductionProxyChromeSettingsFactory::HasDataReductionProxyChromeSettings(
24 content::BrowserContext* context) { 31 content::BrowserContext* context) {
25 return GetInstance()->GetServiceForBrowserContext(context, false) != NULL; 32 return GetInstance()->GetServiceForBrowserContext(context, false) != NULL;
26 } 33 }
27 34
28 // static 35 // static
29 DataReductionProxySettingsFactoryAndroid* 36 DataReductionProxyChromeSettingsFactory*
30 DataReductionProxySettingsFactoryAndroid::GetInstance() { 37 DataReductionProxyChromeSettingsFactory::GetInstance() {
31 return Singleton<DataReductionProxySettingsFactoryAndroid>::get(); 38 return Singleton<DataReductionProxyChromeSettingsFactory>::get();
32 } 39 }
33 40
34 41
35 DataReductionProxySettingsFactoryAndroid:: 42 DataReductionProxyChromeSettingsFactory::
36 DataReductionProxySettingsFactoryAndroid() 43 DataReductionProxyChromeSettingsFactory()
37 : BrowserContextKeyedServiceFactory( 44 : BrowserContextKeyedServiceFactory(
38 "DataReductionProxySettingsAndroid", 45 "DataReductionProxyChromeSettings",
39 BrowserContextDependencyManager::GetInstance()) { 46 BrowserContextDependencyManager::GetInstance()) {
40 } 47 }
41 48
42 DataReductionProxySettingsFactoryAndroid:: 49 DataReductionProxyChromeSettingsFactory::
43 ~DataReductionProxySettingsFactoryAndroid() { 50 ~DataReductionProxyChromeSettingsFactory() {
44 } 51 }
45 52
46 KeyedService* DataReductionProxySettingsFactoryAndroid::BuildServiceInstanceFor( 53 KeyedService* DataReductionProxyChromeSettingsFactory::BuildServiceInstanceFor(
47 content::BrowserContext* context) const { 54 content::BrowserContext* context) const {
48 Profile* profile = static_cast<Profile*>(context);
49 int flags = DataReductionProxyParams::kFallbackAllowed; 55 int flags = DataReductionProxyParams::kFallbackAllowed;
50 if (DataReductionProxyParams::IsIncludedInFieldTrial()) 56 if (DataReductionProxyParams::IsIncludedInFieldTrial())
51 flags |= DataReductionProxyParams::kAllowed; 57 flags |= DataReductionProxyParams::kAllowed;
52 if (DataReductionProxyParams::IsIncludedInAlternativeFieldTrial()) 58 if (DataReductionProxyParams::IsIncludedInAlternativeFieldTrial())
53 flags |= DataReductionProxyParams::kAlternativeAllowed; 59 flags |= DataReductionProxyParams::kAlternativeAllowed;
54 if (DataReductionProxyParams::IsIncludedInPromoFieldTrial()) 60 if (DataReductionProxyParams::IsIncludedInPromoFieldTrial())
55 flags |= DataReductionProxyParams::kPromoAllowed; 61 flags |= DataReductionProxyParams::kPromoAllowed;
56 if (DataReductionProxyParams::IsIncludedInHoldbackFieldTrial()) 62 if (DataReductionProxyParams::IsIncludedInHoldbackFieldTrial())
57 flags |= DataReductionProxyParams::kHoldback; 63 flags |= DataReductionProxyParams::kHoldback;
58 64
59 DataReductionProxySettingsAndroid* settings = 65 DataReductionProxyParams* params = new DataReductionProxyParams(flags);
60 new DataReductionProxySettingsAndroid( 66
61 new DataReductionProxyParams(flags)); 67 // Takes ownership of params.
62 settings->InitDataReductionProxySettings(profile); 68 return new DataReductionProxyChromeSettings(params);
63 return settings;
64 } 69 }
65
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698