From af6588f8d723931a298c995fa97259bb7f7deb55 Mon Sep 17 00:00:00 2001 From: Zeno Albisser Date: Fri, 5 Dec 2014 15:04:29 +0100 Subject: BASELINE: Update chromium to 40.0.2214.28 and ninja to 1.5.3. Change-Id: I759465284fd64d59ad120219cbe257f7402c4181 Reviewed-by: Andras Becsi --- chromium/net/base/mock_file_stream.h | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'chromium/net/base/mock_file_stream.h') diff --git a/chromium/net/base/mock_file_stream.h b/chromium/net/base/mock_file_stream.h index c9f07f02487..7b7dea83170 100644 --- a/chromium/net/base/mock_file_stream.h +++ b/chromium/net/base/mock_file_stream.h @@ -25,18 +25,19 @@ class MockFileStream : public net::FileStream { explicit MockFileStream(const scoped_refptr& task_runner); MockFileStream(base::File file, const scoped_refptr& task_runner); - virtual ~MockFileStream(); + ~MockFileStream() override; // FileStream methods. - virtual int Seek(net::Whence whence, int64 offset, - const Int64CompletionCallback& callback) OVERRIDE; - virtual int Read(IOBuffer* buf, - int buf_len, - const CompletionCallback& callback) OVERRIDE; - virtual int Write(IOBuffer* buf, - int buf_len, - const CompletionCallback& callback) OVERRIDE; - virtual int Flush(const CompletionCallback& callback) OVERRIDE; + int Seek(base::File::Whence whence, + int64 offset, + const Int64CompletionCallback& callback) override; + int Read(IOBuffer* buf, + int buf_len, + const CompletionCallback& callback) override; + int Write(IOBuffer* buf, + int buf_len, + const CompletionCallback& callback) override; + int Flush(const CompletionCallback& callback) override; void set_forced_error_async(int error) { forced_error_ = error; -- cgit v1.2.1