Merge 159454 - Flush at the end of local file writing in FileWriter API.

net/base/file_stream_posix.h

 // Copyright (c) 2012 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.
 
 // This file implements FileStream for POSIX.
 
 #ifndef NET_BASE_FILE_STREAM_POSIX_H_
 #define NET_BASE_FILE_STREAM_POSIX_H_
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 30 matching lines @@
   int Seek(Whence whence, int64 offset,
            const Int64CompletionCallback& callback);
   int64 SeekSync(Whence whence, int64 offset);
   int64 Available();
   int Read(IOBuffer* buf, int buf_len, const CompletionCallback& callback);
   int ReadSync(char* buf, int buf_len);
   int ReadUntilComplete(char *buf, int buf_len);
   int Write(IOBuffer* buf, int buf_len, const CompletionCallback& callback);
   int WriteSync(const char* buf, int buf_len);
   int64 Truncate(int64 bytes);
-  int Flush();
+  int Flush(const CompletionCallback& callback);
+  int FlushSync();
   void EnableErrorStatistics();
   void SetBoundNetLogSource(
       const net::BoundNetLog& owner_bound_net_log);
   base::PlatformFile GetPlatformFileForTesting();
 
   // Resets on_io_complete_ and WeakPtr's.
   // Called when Read() or Write() is completed.
   void ResetOnIOComplete();
 
  private:
@@ skipping 11 matching lines @@
   net::BoundNetLog bound_net_log_;
   base::WeakPtrFactory<FileStreamPosix> weak_ptr_factory_;
   scoped_ptr<base::WaitableEvent> on_io_complete_;
 
   DISALLOW_COPY_AND_ASSIGN(FileStreamPosix);
 };
 
 }  // namespace net
 
 #endif  // NET_BASE_FILE_STREAM_POSIX_H