net: Split FileStream::Read/Write() into sync and async versions.

Historically, FileStream::Read/Write() used to take NULL for synchronous
operations, but these are replaced with ComplocationCallback(), which
is rather ugly. ReadSync() and WriteSync() which do not take a
CompletionCallback are introduced for synchronous operations.
Having function separate signatures make clients code cleaner,
and easier to catch synchronous operations on wrong threads.

This convention also matches with Open/OpenSync and Close/CloseSync.

BUG=72001
TEST=try bots.

Review URL: https://chromiumcodereview.appspot.com/9365024

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122031 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 8 deletions

diff --git a/chrome/browser/sessions/session_backend.cc b/chrome/browser/sessions/session_backend.cc
index 419678e..8a17036 100644
--- a/chrome/browser/sessions/session_backend.cc
+++ b/chrome/browser/sessions/session_backend.cc
@@ -318,22 +318,22 @@ bool SessionBackend::AppendCommandsToFile(net::FileStream* file,
       UMA_HISTOGRAM_COUNTS("TabRestore.command_size", total_size);
     else
       UMA_HISTOGRAM_COUNTS("SessionRestore.command_size", total_size);
-    wrote = file->Write(reinterpret_cast<const char*>(&total_size),
-                        sizeof(total_size), net::CompletionCallback());
+    wrote = file->WriteSync(reinterpret_cast<const char*>(&total_size),
+                            sizeof(total_size));
     if (wrote != sizeof(total_size)) {
       NOTREACHED() << "error writing";
       return false;
     }
     id_type command_id = (*i)->id();
-    wrote = file->Write(reinterpret_cast<char*>(&command_id),
-                        sizeof(command_id), net::CompletionCallback());
+    wrote = file->WriteSync(reinterpret_cast<char*>(&command_id),
+                            sizeof(command_id));
     if (wrote != sizeof(command_id)) {
       NOTREACHED() << "error writing";
       return false;
     }
     if (content_size > 0) {
-      wrote = file->Write(reinterpret_cast<char*>((*i)->contents()),
-                          content_size, net::CompletionCallback());
+      wrote = file->WriteSync(reinterpret_cast<char*>((*i)->contents()),
+                              content_size);
       if (wrote != content_size) {
         NOTREACHED() << "error writing";
         return false;
@@ -378,8 +378,8 @@ net::FileStream* SessionBackend::OpenAndWriteHeader(const FilePath& path) {
   FileHeader header;
   header.signature = kFileSignature;
   header.version = kFileCurrentVersion;
-  int wrote = file->Write(reinterpret_cast<char*>(&header),
-                          sizeof(header), net::CompletionCallback());
+  int wrote = file->WriteSync(reinterpret_cast<char*>(&header),
+                              sizeof(header));
   if (wrote != sizeof(header))
     return NULL;
   return file.release();