Disk cache: Simplyfy some of the test infrastructure.

net/disk_cache/mapped_file_unittest.cc

 // Copyright (c) 2011 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 "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/string_util.h"
 #include "net/disk_cache/disk_cache_test_base.h"
 #include "net/disk_cache/disk_cache_test_util.h"
 #include "net/disk_cache/mapped_file.h"
@@ skipping 24 matching lines @@
     NOTREACHED();
     helper_->set_callback_reused_error(true);
   }
 
   helper_->CallbackWasCalled();
 }
 
 }  // namespace
 
 TEST_F(DiskCacheTest, MappedFile_SyncIO) {
-  FilePath filename = GetCacheFilePath().AppendASCII("a_test");
+  FilePath filename = cache_path_.AppendASCII("a_test");
   scoped_refptr<disk_cache::MappedFile> file(new disk_cache::MappedFile);
   ASSERT_TRUE(CreateCacheTestFile(filename));
   ASSERT_TRUE(file->Init(filename, 8192));
 
   char buffer1[20];
   char buffer2[20];
   CacheTestFillBuffer(buffer1, sizeof(buffer1), false);
   base::strlcpy(buffer1, "the data", arraysize(buffer1));
   EXPECT_TRUE(file->Write(buffer1, sizeof(buffer1), 8192));
   EXPECT_TRUE(file->Read(buffer2, sizeof(buffer2), 8192));
   EXPECT_STREQ(buffer1, buffer2);
 }
 
 TEST_F(DiskCacheTest, MappedFile_AsyncIO) {
-  FilePath filename = GetCacheFilePath().AppendASCII("a_test");
+  FilePath filename = cache_path_.AppendASCII("a_test");
   scoped_refptr<disk_cache::MappedFile> file(new disk_cache::MappedFile);
   ASSERT_TRUE(CreateCacheTestFile(filename));
   ASSERT_TRUE(file->Init(filename, 8192));
 
   int max_id = 0;
   MessageLoopHelper helper;
   FileCallbackTest callback(1, &helper, &max_id);
 
   char buffer1[20];
   char buffer2[20];
@@ skipping 11 matching lines @@
               &completed));
   if (!completed)
     expected++;
 
   helper.WaitUntilCacheIoFinished(expected);
 
   EXPECT_EQ(expected, helper.callbacks_called());
   EXPECT_FALSE(helper.callback_reused_error());
   EXPECT_STREQ(buffer1, buffer2);
 }