Revert 51858 - Disk cache: Switch the disk cache to use the cache_thread. ...

net/disk_cache/disk_cache_test_base.cc

 // Copyright (c) 2006-2010 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/disk_cache/disk_cache_test_base.h"
 
-#include "net/base/net_errors.h"
 #include "net/base/test_completion_callback.h"
 #include "net/disk_cache/backend_impl.h"
 #include "net/disk_cache/disk_cache_test_util.h"
 #include "net/disk_cache/mem_backend_impl.h"
 
 void DiskCacheTest::TearDown() {
   MessageLoop::current()->RunAllPending();
 }
 
 void DiskCacheTestWithCache::SetMaxSize(int size) {
@@ skipping 42 matching lines @@
 
   if (!cache_thread_.IsRunning()) {
     EXPECT_TRUE(cache_thread_.StartWithOptions(
                     base::Thread::Options(MessageLoop::TYPE_IO, 0)));
   }
   ASSERT_TRUE(cache_thread_.message_loop() != NULL);
 
   if (implementation_)
     return InitDiskCacheImpl(path);
 
-  scoped_refptr<base::MessageLoopProxy> thread =
-      use_current_thread_ ? base::MessageLoopProxy::CreateForCurrentThread() :
-                            cache_thread_.message_loop_proxy();
-
   TestCompletionCallback cb;
   int rv = disk_cache::BackendImpl::CreateBackend(
                path, force_creation_, size_, net::DISK_CACHE,
-               disk_cache::kNoRandom, thread, &cache_, &cb);
+               disk_cache::kNoRandom, cache_thread_.message_loop_proxy(),
+               &cache_, &cb);
   ASSERT_EQ(net::OK, cb.GetResult(rv));
 }
 
 void DiskCacheTestWithCache::InitDiskCacheImpl(const FilePath& path) {
-  scoped_refptr<base::MessageLoopProxy> thread =
-      use_current_thread_ ? base::MessageLoopProxy::CreateForCurrentThread() :
-                            cache_thread_.message_loop_proxy();
   if (mask_)
-    cache_impl_ = new disk_cache::BackendImpl(path, mask_, thread);
+    cache_impl_ = new disk_cache::BackendImpl(
+                      path, mask_, cache_thread_.message_loop_proxy());
   else
-    cache_impl_ = new disk_cache::BackendImpl(path, thread);
+    cache_impl_ = new disk_cache::BackendImpl(
+                      path, cache_thread_.message_loop_proxy());
 
   cache_ = cache_impl_;
   ASSERT_TRUE(NULL != cache_);
 
   if (size_)
     EXPECT_TRUE(cache_impl_->SetMaxSize(size_));
 
   if (new_eviction_)
     cache_impl_->SetNewEviction();
 
   cache_impl_->SetFlags(disk_cache::kNoRandom);
-  TestCompletionCallback cb;
-  int rv = cache_impl_->Init(&cb);
-  ASSERT_EQ(net::OK, cb.GetResult(rv));
+  ASSERT_TRUE(cache_impl_->Init());
 }
 
 void DiskCacheTestWithCache::TearDown() {
   MessageLoop::current()->RunAllPending();
   delete cache_;
   if (cache_thread_.IsRunning())
     cache_thread_.Stop();
 
   if (!memory_only_ && integrity_) {
     FilePath path = GetCacheFilePath();
     EXPECT_TRUE(CheckCacheIntegrity(path, new_eviction_));
   }
 
   PlatformTest::TearDown();
 }
 
 // We are expected to leak memory when simulating crashes.
 void DiskCacheTestWithCache::SimulateCrash() {
   ASSERT_TRUE(implementation_ && !memory_only_);
-  TestCompletionCallback cb;
-  int rv = cache_impl_->FlushQueueForTest(&cb);
-  ASSERT_EQ(net::OK, cb.GetResult(rv));
   cache_impl_->ClearRefCountForTest();
 
   delete cache_impl_;
   FilePath path = GetCacheFilePath();
   EXPECT_TRUE(CheckCacheIntegrity(path, new_eviction_));
 
   InitDiskCacheImpl(path);
 }
 
 void DiskCacheTestWithCache::SetTestMode() {
@@ skipping 39 matching lines @@
   int rv = cache_->DoomEntriesSince(initial_time, &cb);
   return cb.GetResult(rv);
 }
 
 int DiskCacheTestWithCache::OpenNextEntry(void** iter,
                                           disk_cache::Entry** next_entry) {
   TestCompletionCallback cb;
   int rv = cache_->OpenNextEntry(iter, next_entry, &cb);
   return cb.GetResult(rv);
 }
-
-void DiskCacheTestWithCache::FlushQueueForTest() {
-  if (memory_only_ || !cache_impl_)
-    return;
-
-  TestCompletionCallback cb;
-  int rv = cache_impl_->FlushQueueForTest(&cb);
-  EXPECT_EQ(net::OK, cb.GetResult(rv));
-}