Remove network load flags not used in net/

net/http/http_cache_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/http/http_cache.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 934 matching lines @@
   RunTransactionTestAndGetTiming(cache.http_cache(), transaction, log.bound(),
                                  &load_timing_info);
 
   EXPECT_EQ(2, cache.network_layer()->transaction_count());
   EXPECT_EQ(1, cache.disk_cache()->open_count());
   EXPECT_EQ(1, cache.disk_cache()->create_count());
   TestLoadTimingNetworkRequest(load_timing_info);
   RemoveMockTransaction(&transaction);
 }
 
-// Tests that LOAD_FROM_CACHE_IF_OFFLINE returns proper response on
-// network success
-TEST(HttpCache, SimpleGET_CacheOverride_Network) {
-  MockHttpCache cache;
-
-  // Prime cache.
-  MockTransaction transaction(kSimpleGET_Transaction);
-  transaction.load_flags |= LOAD_FROM_CACHE_IF_OFFLINE;
-  transaction.response_headers = "Cache-Control: no-cache\n";
-
-  AddMockTransaction(&transaction);
-  RunTransactionTest(cache.http_cache(), transaction);
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-  RemoveMockTransaction(&transaction);
-
-  // Re-run transaction; make sure the result came from the network,
-  // not the cache.
-  transaction.data = "Changed data.";
-  AddMockTransaction(&transaction);
-  HttpResponseInfo response_info;
-  RunTransactionTestWithResponseInfo(cache.http_cache(), transaction,
-                                     &response_info);
-
-  EXPECT_EQ(2, cache.network_layer()->transaction_count());
-  EXPECT_FALSE(response_info.server_data_unavailable);
-  EXPECT_TRUE(response_info.network_accessed);
-
-  RemoveMockTransaction(&transaction);
-}
-
-// Tests that LOAD_FROM_CACHE_IF_OFFLINE returns proper response on
-// offline failure
-TEST(HttpCache, SimpleGET_CacheOverride_Offline) {
-  MockHttpCache cache;
-
-  // Prime cache.
-  MockTransaction transaction(kSimpleGET_Transaction);
-  transaction.load_flags |= LOAD_FROM_CACHE_IF_OFFLINE;
-  transaction.response_headers = "Cache-Control: no-cache\n";
-
-  AddMockTransaction(&transaction);
-  RunTransactionTest(cache.http_cache(), transaction);
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-  RemoveMockTransaction(&transaction);
-
-  // Network failure with offline error; should return cache entry above +
-  // flag signalling stale data.
-  transaction.return_code = ERR_NAME_NOT_RESOLVED;
-  AddMockTransaction(&transaction);
-
-  MockHttpRequest request(transaction);
-  TestCompletionCallback callback;
-  scoped_ptr<HttpTransaction> trans;
-  ASSERT_EQ(OK, cache.CreateTransaction(&trans));
-  int rv = trans->Start(&request, callback.callback(), BoundNetLog());
-  EXPECT_EQ(OK, callback.GetResult(rv));
-
-  const HttpResponseInfo* response_info = trans->GetResponseInfo();
-  ASSERT_TRUE(response_info);
-  EXPECT_TRUE(response_info->server_data_unavailable);
-  EXPECT_TRUE(response_info->was_cached);
-  EXPECT_FALSE(response_info->network_accessed);
-  ReadAndVerifyTransaction(trans.get(), transaction);
-  EXPECT_EQ(2, cache.network_layer()->transaction_count());
-
-  RemoveMockTransaction(&transaction);
-}
-
-// Tests that LOAD_FROM_CACHE_IF_OFFLINE returns proper response on
-// non-offline failure.
-TEST(HttpCache, SimpleGET_CacheOverride_NonOffline) {
-  MockHttpCache cache;
-
-  // Prime cache.
-  MockTransaction transaction(kSimpleGET_Transaction);
-  transaction.load_flags |= LOAD_FROM_CACHE_IF_OFFLINE;
-  transaction.response_headers = "Cache-Control: no-cache\n";
-
-  AddMockTransaction(&transaction);
-  RunTransactionTest(cache.http_cache(), transaction);
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-  RemoveMockTransaction(&transaction);
-
-  // Network failure with non-offline error; should fail with that error.
-  transaction.return_code = ERR_PROXY_CONNECTION_FAILED;
-  AddMockTransaction(&transaction);
-
-  HttpResponseInfo response_info2;
-  RunTransactionTestWithResponseInfo(cache.http_cache(), transaction,
-                                     &response_info2);
-
-  EXPECT_EQ(2, cache.network_layer()->transaction_count());
-  EXPECT_FALSE(response_info2.server_data_unavailable);
-
-  RemoveMockTransaction(&transaction);
-}
-
 // Tests that was_cached was set properly on a failure, even if the cached
 // response wasn't returned.
 TEST(HttpCache, SimpleGET_CacheSignal_Failure) {
   MockHttpCache cache;
 
   // Prime cache.
   MockTransaction transaction(kSimpleGET_Transaction);
   transaction.response_headers = "Cache-Control: no-cache\n";
 
   AddMockTransaction(&transaction);
@@ skipping 6836 matching lines @@
   EXPECT_EQ(LOAD_STATE_WAITING_FOR_CACHE, second->trans->GetLoadState());
   base::MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ(LOAD_STATE_IDLE, second->trans->GetLoadState());
   ASSERT_TRUE(second->trans->GetResponseInfo());
   EXPECT_TRUE(second->trans->GetResponseInfo()->headers->HasHeaderValue(
       "Cache-Control", "no-store"));
   ReadAndVerifyTransaction(second->trans.get(), kSimpleGET_Transaction);
 }
 
 }  // namespace net