| Index: components/data_reduction_proxy/browser/data_reduction_proxy_usage_stats_unittest.cc
|
| diff --git a/components/data_reduction_proxy/browser/data_reduction_proxy_usage_stats_unittest.cc b/components/data_reduction_proxy/browser/data_reduction_proxy_usage_stats_unittest.cc
|
| index 39a951fc9442e341a509a2027b732b1202c13665..ebfefc251fed7f5c9247072d62d6a2e7f7be5b63 100644
|
| --- a/components/data_reduction_proxy/browser/data_reduction_proxy_usage_stats_unittest.cc
|
| +++ b/components/data_reduction_proxy/browser/data_reduction_proxy_usage_stats_unittest.cc
|
| @@ -44,9 +44,10 @@ class DataReductionProxyUsageStatsTest : public testing::Test {
|
| public:
|
| DataReductionProxyUsageStatsTest()
|
| : loop_proxy_(MessageLoopProxy::current().get()),
|
| - context_(true),
|
| - mock_url_request_(GURL(), net::IDLE, &delegate_, &context_) {
|
| + context_(true) {
|
| context_.Init();
|
| + mock_url_request_ = context_.CreateRequest(GURL(), net::IDLE, &delegate_,
|
| + NULL);
|
| }
|
| // Required for MessageLoopProxy::current().
|
| base::MessageLoopForUI loop_;
|
| @@ -56,7 +57,7 @@ class DataReductionProxyUsageStatsTest : public testing::Test {
|
| TestURLRequestContext context_;
|
| TestDelegate delegate_;
|
| DataReductionProxyParamsMock mock_params_;
|
| - URLRequest mock_url_request_;
|
| + scoped_ptr<URLRequest> mock_url_request_;
|
| };
|
|
|
| TEST_F(DataReductionProxyUsageStatsTest, isDataReductionProxyUnreachable) {
|
| @@ -85,17 +86,18 @@ TEST_F(DataReductionProxyUsageStatsTest, isDataReductionProxyUnreachable) {
|
| for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_cases); ++i) {
|
| TestCase test_case = test_cases[i];
|
|
|
| - EXPECT_CALL(mock_params_, IsDataReductionProxyEligible(&mock_url_request_))
|
| - .WillRepeatedly(Return(test_case.is_proxy_eligible));
|
| EXPECT_CALL(mock_params_,
|
| - WasDataReductionProxyUsed(&mock_url_request_, NULL))
|
| + IsDataReductionProxyEligible(mock_url_request_.get()))
|
| + .WillRepeatedly(Return(test_case.is_proxy_eligible));
|
| + EXPECT_CALL(mock_params_,
|
| + WasDataReductionProxyUsed(mock_url_request_.get(), NULL))
|
| .WillRepeatedly(Return(test_case.was_proxy_used));
|
|
|
| scoped_ptr<DataReductionProxyUsageStats> usage_stats(
|
| new DataReductionProxyUsageStats(
|
| &mock_params_, loop_proxy_, loop_proxy_));
|
|
|
| - usage_stats->OnUrlRequestCompleted(&mock_url_request_, false);
|
| + usage_stats->OnUrlRequestCompleted(mock_url_request_.get(), false);
|
| MessageLoop::current()->RunUntilIdle();
|
|
|
| EXPECT_EQ(test_case.is_unreachable,
|
|
|