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

net/base/mock_file_stream.h

Index: net/base/mock_file_stream.h
===================================================================
--- net/base/mock_file_stream.h	(revision 160294)
+++ net/base/mock_file_stream.h	(working copy)
@@ -43,7 +43,8 @@
                     const CompletionCallback& callback) OVERRIDE;
   virtual int WriteSync(const char* buf, int buf_len) OVERRIDE;
   virtual int64 Truncate(int64 bytes) OVERRIDE;
-  virtual int Flush() OVERRIDE;
+  virtual int Flush(const CompletionCallback& callback) OVERRIDE;
+  virtual int FlushSync() OVERRIDE;
 
   void set_forced_error(int error) { forced_error_ = error; }
   void clear_forced_error() { forced_error_ = net::OK; }