| Index: components/data_reduction_proxy/core/common/data_reduction_proxy_event_store_unittest.cc
|
| diff --git a/components/data_reduction_proxy/core/common/data_reduction_proxy_event_store_unittest.cc b/components/data_reduction_proxy/core/common/data_reduction_proxy_event_store_unittest.cc
|
| index 220cb51504657fb2699ad38608cf5ce002384642..4d1473808a808573ae331b52c89f330b59b19232 100644
|
| --- a/components/data_reduction_proxy/core/common/data_reduction_proxy_event_store_unittest.cc
|
| +++ b/components/data_reduction_proxy/core/common/data_reduction_proxy_event_store_unittest.cc
|
| @@ -111,30 +111,30 @@ TEST_F(DataReductionProxyEventStoreTest, TestAddBypassTypeEvent) {
|
| EXPECT_NE(nullptr, proxy()->last_bypass_event_.get());
|
| }
|
|
|
| -TEST_F(DataReductionProxyEventStoreTest, TestBeginCanaryRequest) {
|
| +TEST_F(DataReductionProxyEventStoreTest, TestBeginSecureProxyCheck) {
|
| EXPECT_EQ(0u, proxy()->stored_events_.size());
|
| - EXPECT_EQ(PROBE_UNKNOWN, proxy()->probe_state_);
|
| - proxy()->BeginCanaryRequest(bound_net_log(), GURL());
|
| + EXPECT_EQ(CHECK_UNKNOWN, proxy()->secure_proxy_check_state_);
|
| + proxy()->BeginSecureProxyCheck(bound_net_log(), GURL());
|
| task_runner()->RunPendingTasks();
|
| EXPECT_EQ(1u, proxy()->stored_events_.size());
|
| EXPECT_EQ(1u, net_log()->GetSize());
|
| net::CapturingNetLog::CapturedEntry entry = GetSingleEntry();
|
| EXPECT_EQ(net::NetLog::TYPE_DATA_REDUCTION_PROXY_CANARY_REQUEST,
|
| entry.type);
|
| - EXPECT_EQ(PROBE_PENDING, proxy()->probe_state_);
|
| + EXPECT_EQ(CHECK_PENDING, proxy()->secure_proxy_check_state_);
|
| }
|
|
|
| -TEST_F(DataReductionProxyEventStoreTest, TestEndCanaryRequest) {
|
| +TEST_F(DataReductionProxyEventStoreTest, TestEndSecureProxyCheck) {
|
| EXPECT_EQ(0u, proxy()->stored_events_.size());
|
| - EXPECT_EQ(PROBE_UNKNOWN, proxy()->probe_state_);
|
| - proxy()->EndCanaryRequest(bound_net_log(), 0);
|
| + EXPECT_EQ(CHECK_UNKNOWN, proxy()->secure_proxy_check_state_);
|
| + proxy()->EndSecureProxyCheck(bound_net_log(), 0);
|
| task_runner()->RunPendingTasks();
|
| EXPECT_EQ(1u, proxy()->stored_events_.size());
|
| EXPECT_EQ(1u, net_log()->GetSize());
|
| net::CapturingNetLog::CapturedEntry entry = GetSingleEntry();
|
| EXPECT_EQ(net::NetLog::TYPE_DATA_REDUCTION_PROXY_CANARY_REQUEST,
|
| entry.type);
|
| - EXPECT_EQ(PROBE_SUCCESS, proxy()->probe_state_);
|
| + EXPECT_EQ(CHECK_SUCCESS, proxy()->secure_proxy_check_state_);
|
| }
|
|
|
| } // namespace data_reduction_proxy
|
|
|