Fixing redirect through DataReductionProxy logic.

components/data_reduction_proxy/core/browser/data_reduction_proxy_data_unittest.cc

Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_data_unittest.cc
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_data_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_data_unittest.cc
index aff41918c6d5f05f31fea145d54a2ed4a4c74cc1..09aaaa199bab3d20784e93627712bbf403bf8c57 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_data_unittest.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_data_unittest.cc
@@ -35,46 +35,46 @@ TEST_F(DataReductionProxyDataTest, BasicSettersAndGetters) {
   data->set_used_data_reduction_proxy(false);
   EXPECT_FALSE(data->used_data_reduction_proxy());
 
   EXPECT_FALSE(data->lofi_requested());
   data->set_lofi_requested(true);
   EXPECT_TRUE(data->lofi_requested());
   data->set_lofi_requested(false);
   EXPECT_FALSE(data->lofi_requested());
 
   EXPECT_EQ(std::string(), data->session_key());
-  EXPECT_EQ(GURL(std::string()), data->original_request_url());
+  EXPECT_EQ(GURL(std::string()), data->request_url());
   std::string session_key = "test-key";
   data->set_session_key(session_key);
   EXPECT_EQ(session_key, data->session_key());
   GURL test_url("test-url");
-  data->set_original_request_url(test_url);
-  EXPECT_EQ(test_url, data->original_request_url());
+  data->set_request_url(test_url);
+  EXPECT_EQ(test_url, data->request_url());
   EXPECT_EQ(net::EFFECTIVE_CONNECTION_TYPE_UNKNOWN,
             data->effective_connection_type());
   data->set_effective_connection_type(net::EFFECTIVE_CONNECTION_TYPE_OFFLINE);
   EXPECT_EQ(net::EFFECTIVE_CONNECTION_TYPE_OFFLINE,
             data->effective_connection_type());
 }
 
 TEST_F(DataReductionProxyDataTest, AddToURLRequest) {
   std::unique_ptr<net::URLRequestContext> context(new net::URLRequestContext());
   std::unique_ptr<net::URLRequest> fake_request(context->CreateRequest(
       GURL("http://www.google.com"), net::RequestPriority::IDLE, nullptr));
   DataReductionProxyData* data =
       DataReductionProxyData::GetData(*fake_request.get());
-  EXPECT_TRUE(!data);
+  EXPECT_FALSE(data);
   data =
       DataReductionProxyData::GetDataAndCreateIfNecessary(fake_request.get());
-  EXPECT_FALSE(!data);
+  EXPECT_TRUE(data);
   data = DataReductionProxyData::GetData(*fake_request.get());
-  EXPECT_FALSE(!data);
+  EXPECT_TRUE(data);
   DataReductionProxyData* data2 =
       DataReductionProxyData::GetDataAndCreateIfNecessary(fake_request.get());
   EXPECT_EQ(data, data2);
 }
 
 TEST_F(DataReductionProxyDataTest, DeepCopy) {
   const struct {
     bool data_reduction_used;
     bool lofi_on;
   } tests[] = {
@@ -92,25 +92,38 @@ TEST_F(DataReductionProxyDataTest, DeepCopy) {
       },
   };
 
   for (size_t i = 0; i < arraysize(tests); ++i) {
     static const char kSessionKey[] = "test-key";
     static const GURL kTestURL("test-url");
     std::unique_ptr<DataReductionProxyData> data(new DataReductionProxyData());
     data->set_used_data_reduction_proxy(tests[i].data_reduction_used);
     data->set_lofi_requested(tests[i].lofi_on);
     data->set_session_key(kSessionKey);
-    data->set_original_request_url(kTestURL);
+    data->set_request_url(kTestURL);
     data->set_effective_connection_type(net::EFFECTIVE_CONNECTION_TYPE_OFFLINE);
     std::unique_ptr<DataReductionProxyData> copy = data->DeepCopy();
     EXPECT_EQ(tests[i].lofi_on, copy->lofi_requested());
     EXPECT_EQ(tests[i].data_reduction_used, copy->used_data_reduction_proxy());
     EXPECT_EQ(kSessionKey, copy->session_key());
-    EXPECT_EQ(kTestURL, copy->original_request_url());
+    EXPECT_EQ(kTestURL, copy->request_url());
     EXPECT_EQ(net::EFFECTIVE_CONNECTION_TYPE_OFFLINE,
               copy->effective_connection_type());
   }
 }
 
+TEST_F(DataReductionProxyDataTest, ClearData) {
+  std::unique_ptr<net::URLRequestContext> context(new net::URLRequestContext());
+  std::unique_ptr<net::URLRequest> fake_request(context->CreateRequest(
+      GURL("http://www.google.com"), net::RequestPriority::IDLE, nullptr));
+
+  DataReductionProxyData* data =
+      DataReductionProxyData::GetDataAndCreateIfNecessary(fake_request.get());
+  EXPECT_TRUE(data);
+  DataReductionProxyData::ClearData(fake_request.get());
+  data = DataReductionProxyData::GetData(*fake_request.get());
+  EXPECT_FALSE(data);
+}
+
 }  // namespace
 
 }  // namespace data_reduction_proxy