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

net/tools/dump_cache/cache_dumper.cc

 // Copyright (c) 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/tools/dump_cache/cache_dumper.h"
 
 #include "net/base/io_buffer.h"
+#include "net/base/net_errors.h"
 #include "net/disk_cache/entry_impl.h"
 #include "net/http/http_cache.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_response_info.h"
 #include "net/tools/dump_cache/url_to_filename_encoder.h"
 
-bool CacheDumper::CreateEntry(const std::string& key,
-                              disk_cache::Entry** entry) {
-  return cache_->CreateEntry(key, entry);
+int CacheDumper::CreateEntry(const std::string& key,
+                             disk_cache::Entry** entry,
+                             net::CompletionCallback* callback) {
+  return cache_->CreateEntry(key, entry, callback);
 }
 
 int CacheDumper::WriteEntry(disk_cache::Entry* entry, int index, int offset,
                             net::IOBuffer* buf, int buf_len,
                             net::CompletionCallback* callback) {
   return entry->WriteData(index, offset, buf, buf_len, callback, false);
 }
 
 void CacheDumper::CloseEntry(disk_cache::Entry* entry, base::Time last_used,
                              base::Time last_modified) {
@@ skipping 27 matching lines @@
     // we keep going even if directory creation failed.
     pos++;
   }
   // Now create the full path
   return CreateDirectoryW(path.c_str(), NULL) == TRUE;
 #else
   return file_util::CreateDirectory(path);
 #endif
 }
 
-bool DiskDumper::CreateEntry(const std::string& key,
-                             disk_cache::Entry** entry) {
+int DiskDumper::CreateEntry(const std::string& key,
+                            disk_cache::Entry** entry,
+                            net::CompletionCallback* callback) {
   FilePath path(path_);
   // The URL may not start with a valid protocol; search for it.
   int urlpos = key.find("http");
   std::string url = urlpos > 0 ? key.substr(urlpos) : key;
   std::string base_path = WideToASCII(path_);
   std::string new_path =
       net::UrlToFilenameEncoder::Encode(url, base_path, false);
   entry_path_ = FilePath(ASCIIToWide(new_path));
 
 #ifdef WIN32_LARGE_FILENAME_SUPPORT
@@ skipping 11 matching lines @@
 
   FilePath directory = entry_path_.DirName();
   SafeCreateDirectory(directory.value());
 
   std::wstring file = entry_path_.value();
 #ifdef WIN32_LARGE_FILENAME_SUPPORT
   entry_ = CreateFileW(file.c_str(), GENERIC_WRITE|GENERIC_READ, 0, 0,
                        CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0);
   if (entry_ == INVALID_HANDLE_VALUE)
     wprintf(L"CreateFileW (%s) failed: %d\n", file.c_str(), GetLastError());
-  return entry_ != INVALID_HANDLE_VALUE;
+  return (entry_ != INVALID_HANDLE_VALUE) ? net::OK : net::ERR_FAILED;
 #else
   entry_ = file_util::OpenFile(entry_path_, "w+");
-  return entry_ != NULL;
+  return (entry_ != NULL) ? net::OK : net::ERR_FAILED;
 #endif
 }
 
 // Utility Function to create a normalized header string from a
 // HttpResponseInfo.  The output will be formatted exactly
 // like so:
 //     HTTP/<version> <status_code> <status_text>\n
 //     [<header-name>: <header-values>\n]*
 // meaning, each line is \n-terminated, and there is no extra whitespace
 // beyond the single space separators shown (of course, values can contain
@@ skipping 89 matching lines @@
 
 void DiskDumper::CloseEntry(disk_cache::Entry* entry, base::Time last_used,
                           base::Time last_modified) {
 #ifdef WIN32_LARGE_FILENAME_SUPPORT
   CloseHandle(entry_);
 #else
   file_util::CloseFile(entry_);
 #endif
 }