Change MockBrowsingDataRemover to MockBrowsingDataRemoverDelegate

components/browsing_data/content/storage_partition_http_cache_data_remover.cc

 // Copyright 2015 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 "components/browsing_data/content/storage_partition_http_cache_data_remover.h"
 
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "components/browsing_data/content/conditional_cache_deletion_helper.h"
@@ skipping 65 matching lines @@
       BrowserThread::IO, FROM_HERE,
       base::Bind(
           &StoragePartitionHttpCacheDataRemover::ClearHttpCacheOnIOThread,
           base::Unretained(this)));
 }
 
 void StoragePartitionHttpCacheDataRemover::ClearHttpCacheOnIOThread() {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   next_cache_state_ = CacheState::NONE;
   DCHECK_EQ(CacheState::NONE, next_cache_state_);
-  DCHECK(main_context_getter_.get());
-  DCHECK(media_context_getter_.get());
 
   next_cache_state_ = CacheState::CREATE_MAIN;
   DoClearCache(net::OK);
 }
 
 void StoragePartitionHttpCacheDataRemover::ClearedHttpCache() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   done_callback_.Run();
   base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, this);
 }
 
 // The expected state sequence is CacheState::NONE --> CacheState::CREATE_MAIN
 // --> CacheState::PROCESS_MAIN --> CacheState::CREATE_MEDIA -->

[engedy, 2017/03/23 15:23:07]

nit: Could you please propagate new names of states to this comment?

[msramek, 2017/03/23 15:33:02]

Done.

 // CacheState::PROCESS_MEDIA --> CacheState::DONE, and any errors are ignored.
 void StoragePartitionHttpCacheDataRemover::DoClearCache(int rv) {
   DCHECK_NE(CacheState::NONE, next_cache_state_);
 
   while (rv != net::ERR_IO_PENDING && next_cache_state_ != CacheState::NONE) {
     switch (next_cache_state_) {
       case CacheState::CREATE_MAIN:
       case CacheState::CREATE_MEDIA: {
         // Get a pointer to the cache.
         net::URLRequestContextGetter* getter =
             (next_cache_state_ == CacheState::CREATE_MAIN)
                 ? main_context_getter_.get()
                 : media_context_getter_.get();
+
+        // Caches might not exist in tests.
+        if (!getter) {
+          next_cache_state_ = (next_cache_state_ == CacheState::CREATE_MAIN)
+                                  ? CacheState::CREATE_MEDIA
+                                  : CacheState::DONE;
+          break;
+        }
+
         net::HttpCache* http_cache = getter->GetURLRequestContext()
                                          ->http_transaction_factory()
                                          ->GetCache();
 
         next_cache_state_ = (next_cache_state_ == CacheState::CREATE_MAIN)
                                 ? CacheState::DELETE_MAIN
                                 : CacheState::DELETE_MEDIA;
 
         // Clear QUIC server information from memory and the disk cache.
         http_cache->GetSession()
@@ skipping 61 matching lines @@
       }
       case CacheState::NONE: {
         NOTREACHED() << "bad state";
         return;
       }
     }
   }
 }
 
 }  // namespace browsing_data