Chromium Code Reviews| Index: android_webview/browser/net/android_stream_reader_url_request_job_unittest.cc |
| diff --git a/android_webview/browser/net/android_stream_reader_url_request_job_unittest.cc b/android_webview/browser/net/android_stream_reader_url_request_job_unittest.cc |
| index 4b80c41f8adcc185115e7df1b1a0a3f557f981e6..b9332c58e0b820a01dfc298d29ac6634b0a1d5ca 100644 |
| --- a/android_webview/browser/net/android_stream_reader_url_request_job_unittest.cc |
| +++ b/android_webview/browser/net/android_stream_reader_url_request_job_unittest.cc |
| @@ -51,16 +51,16 @@ using testing::_; |
| class NotImplInputStream : public InputStream { |
| public: |
| NotImplInputStream() {} |
| - virtual ~NotImplInputStream() {} |
| - virtual bool BytesAvailable(int* bytes_available) const override { |
| + ~NotImplInputStream() override {} |
| + bool BytesAvailable(int* bytes_available) const override { |
| NOTIMPLEMENTED(); |
| return false; |
| } |
| - virtual bool Skip(int64_t n, int64_t* bytes_skipped) override { |
| + bool Skip(int64_t n, int64_t* bytes_skipped) override { |
| NOTIMPLEMENTED(); |
| return false; |
| } |
| - virtual bool Read(net::IOBuffer* dest, int length, int* bytes_read) override { |
| + bool Read(net::IOBuffer* dest, int length, int* bytes_read) override { |
| NOTIMPLEMENTED(); |
| return false; |
| } |
| @@ -72,34 +72,32 @@ class StreamReaderDelegate : |
| public: |
| StreamReaderDelegate() {} |
| - virtual scoped_ptr<InputStream> OpenInputStream( |
| - JNIEnv* env, |
| - const GURL& url) override { |
| + scoped_ptr<InputStream> OpenInputStream(JNIEnv* env, |
| + const GURL& url) override { |
| return make_scoped_ptr<InputStream>(new NotImplInputStream()); |
| } |
| - virtual void OnInputStreamOpenFailed(net::URLRequest* request, |
| - bool* restart) override { |
| + void OnInputStreamOpenFailed(net::URLRequest* request, |
| + bool* restart) override { |
| *restart = false; |
| } |
| - virtual bool GetMimeType(JNIEnv* env, |
| - net::URLRequest* request, |
| - android_webview::InputStream* stream, |
| - std::string* mime_type) override { |
| + bool GetMimeType(JNIEnv* env, |
| + net::URLRequest* request, |
| + android_webview::InputStream* stream, |
| + std::string* mime_type) override { |
| return false; |
| } |
| - virtual bool GetCharset(JNIEnv* env, |
| - net::URLRequest* request, |
| - android_webview::InputStream* stream, |
| - std::string* charset) override { |
| + bool GetCharset(JNIEnv* env, |
| + net::URLRequest* request, |
| + android_webview::InputStream* stream, |
| + std::string* charset) override { |
| return false; |
| } |
| - virtual void AppendResponseHeaders( |
| - JNIEnv* env, |
| - net::HttpResponseHeaders* headers) override { |
| + void AppendResponseHeaders(JNIEnv* env, |
| + net::HttpResponseHeaders* headers) override { |
| // no-op |
| } |
| }; |
| @@ -108,9 +106,8 @@ class NullStreamReaderDelegate : public StreamReaderDelegate { |
| public: |
| NullStreamReaderDelegate() {} |
| - virtual scoped_ptr<InputStream> OpenInputStream( |
| - JNIEnv* env, |
| - const GURL& url) override { |
| + scoped_ptr<InputStream> OpenInputStream(JNIEnv* env, |
| + const GURL& url) override { |
| return make_scoped_ptr<InputStream>(NULL); |
| } |
| }; |
| @@ -119,9 +116,8 @@ class HeaderAlteringStreamReaderDelegate : public NullStreamReaderDelegate { |
| public: |
| HeaderAlteringStreamReaderDelegate() {} |
| - virtual void AppendResponseHeaders( |
| - JNIEnv* env, |
| - net::HttpResponseHeaders* headers) override { |
| + void AppendResponseHeaders(JNIEnv* env, |
| + net::HttpResponseHeaders* headers) override { |
| headers->ReplaceStatusLine(kStatusLine); |
| std::string headerLine(kCustomHeaderName); |
| headerLine.append(": "); |
| @@ -167,14 +163,14 @@ class TestStreamReaderJob : public AndroidStreamReaderURLRequestJob { |
| message_loop_proxy_ = base::MessageLoopProxy::current(); |
| } |
| - virtual scoped_ptr<InputStreamReader> CreateStreamReader( |
| + scoped_ptr<InputStreamReader> CreateStreamReader( |
|
boliu
2015/02/04 01:04:38
this one was already missing override, so now look
boliu
2015/02/04 01:06:15
Wahh I can't read.
|
| InputStream* stream) override { |
| return stream_reader_.Pass(); |
| } |
| protected: |
| - virtual ~TestStreamReaderJob() {} |
| + ~TestStreamReaderJob() override {} |
| - virtual base::TaskRunner* GetWorkerThreadRunner() override { |
| + base::TaskRunner* GetWorkerThreadRunner() override { |
| return message_loop_proxy_.get(); |
| } |
| @@ -187,7 +183,7 @@ class AndroidStreamReaderURLRequestJobTest : public Test { |
| AndroidStreamReaderURLRequestJobTest() {} |
| protected: |
| - virtual void SetUp() { |
| + void SetUp() override { |
| context_.set_job_factory(&factory_); |
| context_.set_network_delegate(&network_delegate_); |
| req_ = context_.CreateRequest(GURL("content://foo"), |