OLD | NEW |
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_chrome_settings_fact
ory.h" | 5 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_fact
ory.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/memory/singleton.h" | 8 #include "base/memory/singleton.h" |
9 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h" | 9 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h" |
10 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_usag
e_stats.h" | 10 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_usag
e_stats.h" |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
64 if (DataReductionProxyParams::IsIncludedInHoldbackFieldTrial()) | 64 if (DataReductionProxyParams::IsIncludedInHoldbackFieldTrial()) |
65 flags |= DataReductionProxyParams::kHoldback; | 65 flags |= DataReductionProxyParams::kHoldback; |
66 #if defined(OS_ANDROID) | 66 #if defined(OS_ANDROID) |
67 if (DataReductionProxyParams::IsIncludedInAndroidOnePromoFieldTrial( | 67 if (DataReductionProxyParams::IsIncludedInAndroidOnePromoFieldTrial( |
68 base::android::BuildInfo::GetInstance()->android_build_fp())) { | 68 base::android::BuildInfo::GetInstance()->android_build_fp())) { |
69 flags |= DataReductionProxyParams::kPromoAllowed; | 69 flags |= DataReductionProxyParams::kPromoAllowed; |
70 } | 70 } |
71 #endif | 71 #endif |
72 | 72 |
73 return new DataReductionProxyChromeSettings( | 73 return new DataReductionProxyChromeSettings( |
74 new DataReductionProxyParams(flags)); | 74 scoped_ptr<DataReductionProxyParams>(new DataReductionProxyParams(flags)) |
| 75 .Pass()); |
75 } | 76 } |
OLD | NEW |