| Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_bypass_protocol_unittest.cc
|
| diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_bypass_protocol_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_bypass_protocol_unittest.cc
|
| index 157f0d82b325be2289e49e0e55a5f6cd1b3ed85a..406ece1ea47d03346dc481365979839f136fb6a0 100644
|
| --- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_bypass_protocol_unittest.cc
|
| +++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_bypass_protocol_unittest.cc
|
| @@ -81,12 +81,13 @@ class DataReductionProxyProtocolTest : public testing::Test {
|
| public:
|
| DataReductionProxyProtocolTest() : http_user_agent_settings_("", "") {
|
| settings_.reset(
|
| - new DataReductionProxySettings(CreateTestDataReductionProxyParams()));
|
| - proxy_params_.reset(CreateTestDataReductionProxyParams());
|
| + new DataReductionProxySettings(CreateDataReductionProxyParams()));
|
| + proxy_params_.reset(CreateDataReductionProxyParams().release());
|
| simple_interceptor_.reset(new SimpleURLRequestInterceptor());
|
| net::URLRequestFilter::GetInstance()->AddHostnameInterceptor(
|
| "http", "www.google.com", simple_interceptor_.Pass());
|
| }
|
| +
|
| ~DataReductionProxyProtocolTest() override {
|
| // URLRequestJobs may post clean-up tasks on destruction.
|
| net::URLRequestFilter::GetInstance()->RemoveHostnameHandler(
|
| @@ -94,14 +95,16 @@ class DataReductionProxyProtocolTest : public testing::Test {
|
| base::RunLoop().RunUntilIdle();
|
| }
|
|
|
| - TestDataReductionProxyParams* CreateTestDataReductionProxyParams() {
|
| - return new TestDataReductionProxyParams(
|
| - DataReductionProxyParams::kAllowed |
|
| - DataReductionProxyParams::kFallbackAllowed |
|
| - DataReductionProxyParams::kPromoAllowed,
|
| - TestDataReductionProxyParams::HAS_EVERYTHING &
|
| - ~TestDataReductionProxyParams::HAS_DEV_ORIGIN &
|
| - ~TestDataReductionProxyParams::HAS_DEV_FALLBACK_ORIGIN);
|
| + scoped_ptr<TestDataReductionProxyParams> CreateDataReductionProxyParams() {
|
| + return scoped_ptr<TestDataReductionProxyParams>(
|
| + new TestDataReductionProxyParams(
|
| + DataReductionProxyParams::kAllowed |
|
| + DataReductionProxyParams::kFallbackAllowed |
|
| + DataReductionProxyParams::kPromoAllowed,
|
| + TestDataReductionProxyParams::HAS_EVERYTHING &
|
| + ~TestDataReductionProxyParams::HAS_DEV_ORIGIN &
|
| + ~TestDataReductionProxyParams::HAS_DEV_FALLBACK_ORIGIN))
|
| + .Pass();
|
| }
|
|
|
| void SetUp() override {
|
|
|