Disk Cache: Remove deprecated methods from the disk cache interface....

net/disk_cache/disk_cache_perftest.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 <string>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/perftimer.h"
@@ skipping 48 matching lines @@
 
   PerfTimeLogger timer("Write disk cache entries");
 
   for (int i = 0; i < num_entries; i++) {
     TestEntry entry;
     entry.key = GenerateKey(true);
     entry.data_len = rand() % kMaxSize;
     entries->push_back(entry);
 
     disk_cache::Entry* cache_entry;
-    if (!cache->CreateEntry(entry.key, &cache_entry))
+    TestCompletionCallback cb;
+    int rv = cache->CreateEntry(entry.key, &cache_entry, &cb);
+    if (net::OK != cb.GetResult(rv))
       break;
     int ret = cache_entry->WriteData(0, 0, buffer1, kSize1, &callback, false);
     if (net::ERR_IO_PENDING == ret)
       expected++;
     else if (kSize1 != ret)
       break;
 
     ret = cache_entry->WriteData(1, 0, buffer2, entry.data_len, &callback,
                                  false);
     if (net::ERR_IO_PENDING == ret)
@@ skipping 25 matching lines @@
   int expected = 0;
 
   MessageLoopHelper helper;
 
   const char* message = cold ? "Read disk cache entries (cold)" :
                         "Read disk cache entries (warm)";
   PerfTimeLogger timer(message);
 
   for (int i = 0; i < num_entries; i++) {
     disk_cache::Entry* cache_entry;
-    if (!cache->OpenEntry(entries[i].key, &cache_entry))
+    TestCompletionCallback cb;
+    int rv = cache->OpenEntry(entries[i].key, &cache_entry, &cb);
+    if (net::OK != cb.GetResult(rv))
       break;
     int ret = cache_entry->ReadData(0, 0, buffer1, kSize1, &callback);
     if (net::ERR_IO_PENDING == ret)
       expected++;
     else if (kSize1 != ret)
       break;
 
     ret = cache_entry->ReadData(1, 0, buffer2, entries[i].data_len, &callback);
     if (net::ERR_IO_PENDING == ret)
       expected++;
@@ skipping 118 matching lines @@
 
     files.DeleteBlock(address[entry], false);
     EXPECT_TRUE(files.CreateBlock(disk_cache::RANKINGS, BlockSize(),
                                   &address[entry]));
   }
 
   timer2.Done();
   MessageLoop::current()->RunAllPending();
   delete[] address;
 }