Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(122)

Side by Side Diff: android_webview/browser/net/android_stream_reader_url_request_job_unittest.cc

Issue 896913002: Update {virtual,override,final} to follow C++11 style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "android_webview/browser/input_stream.h" 5 #include "android_webview/browser/input_stream.h"
6 #include "android_webview/browser/net/android_stream_reader_url_request_job.h" 6 #include "android_webview/browser/net/android_stream_reader_url_request_job.h"
7 #include "android_webview/browser/net/aw_url_request_job_factory.h" 7 #include "android_webview/browser/net/aw_url_request_job_factory.h"
8 #include "android_webview/browser/net/input_stream_reader.h" 8 #include "android_webview/browser/net/input_stream_reader.h"
9 #include "base/format_macros.h" 9 #include "base/format_macros.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 using testing::WithArgs; 44 using testing::WithArgs;
45 using testing::_; 45 using testing::_;
46 46
47 // Some of the classes will DCHECK on a null InputStream (which is desirable). 47 // Some of the classes will DCHECK on a null InputStream (which is desirable).
48 // The workaround is to use this class. None of the methods need to be 48 // The workaround is to use this class. None of the methods need to be
49 // implemented as the mock InputStreamReader should never forward calls to the 49 // implemented as the mock InputStreamReader should never forward calls to the
50 // InputStream. 50 // InputStream.
51 class NotImplInputStream : public InputStream { 51 class NotImplInputStream : public InputStream {
52 public: 52 public:
53 NotImplInputStream() {} 53 NotImplInputStream() {}
54 virtual ~NotImplInputStream() {} 54 ~NotImplInputStream() override {}
55 virtual bool BytesAvailable(int* bytes_available) const override { 55 bool BytesAvailable(int* bytes_available) const override {
56 NOTIMPLEMENTED(); 56 NOTIMPLEMENTED();
57 return false; 57 return false;
58 } 58 }
59 virtual bool Skip(int64_t n, int64_t* bytes_skipped) override { 59 bool Skip(int64_t n, int64_t* bytes_skipped) override {
60 NOTIMPLEMENTED(); 60 NOTIMPLEMENTED();
61 return false; 61 return false;
62 } 62 }
63 virtual bool Read(net::IOBuffer* dest, int length, int* bytes_read) override { 63 bool Read(net::IOBuffer* dest, int length, int* bytes_read) override {
64 NOTIMPLEMENTED(); 64 NOTIMPLEMENTED();
65 return false; 65 return false;
66 } 66 }
67 }; 67 };
68 68
69 // Required in order to create an instance of AndroidStreamReaderURLRequestJob. 69 // Required in order to create an instance of AndroidStreamReaderURLRequestJob.
70 class StreamReaderDelegate : 70 class StreamReaderDelegate :
71 public AndroidStreamReaderURLRequestJob::Delegate { 71 public AndroidStreamReaderURLRequestJob::Delegate {
72 public: 72 public:
73 StreamReaderDelegate() {} 73 StreamReaderDelegate() {}
74 74
75 virtual scoped_ptr<InputStream> OpenInputStream( 75 scoped_ptr<InputStream> OpenInputStream(JNIEnv* env,
76 JNIEnv* env, 76 const GURL& url) override {
77 const GURL& url) override {
78 return make_scoped_ptr<InputStream>(new NotImplInputStream()); 77 return make_scoped_ptr<InputStream>(new NotImplInputStream());
79 } 78 }
80 79
81 virtual void OnInputStreamOpenFailed(net::URLRequest* request, 80 void OnInputStreamOpenFailed(net::URLRequest* request,
82 bool* restart) override { 81 bool* restart) override {
83 *restart = false; 82 *restart = false;
84 } 83 }
85 84
86 virtual bool GetMimeType(JNIEnv* env, 85 bool GetMimeType(JNIEnv* env,
87 net::URLRequest* request, 86 net::URLRequest* request,
88 android_webview::InputStream* stream, 87 android_webview::InputStream* stream,
89 std::string* mime_type) override { 88 std::string* mime_type) override {
90 return false; 89 return false;
91 } 90 }
92 91
93 virtual bool GetCharset(JNIEnv* env, 92 bool GetCharset(JNIEnv* env,
94 net::URLRequest* request, 93 net::URLRequest* request,
95 android_webview::InputStream* stream, 94 android_webview::InputStream* stream,
96 std::string* charset) override { 95 std::string* charset) override {
97 return false; 96 return false;
98 } 97 }
99 98
100 virtual void AppendResponseHeaders( 99 void AppendResponseHeaders(JNIEnv* env,
101 JNIEnv* env, 100 net::HttpResponseHeaders* headers) override {
102 net::HttpResponseHeaders* headers) override {
103 // no-op 101 // no-op
104 } 102 }
105 }; 103 };
106 104
107 class NullStreamReaderDelegate : public StreamReaderDelegate { 105 class NullStreamReaderDelegate : public StreamReaderDelegate {
108 public: 106 public:
109 NullStreamReaderDelegate() {} 107 NullStreamReaderDelegate() {}
110 108
111 virtual scoped_ptr<InputStream> OpenInputStream( 109 scoped_ptr<InputStream> OpenInputStream(JNIEnv* env,
112 JNIEnv* env, 110 const GURL& url) override {
113 const GURL& url) override {
114 return make_scoped_ptr<InputStream>(NULL); 111 return make_scoped_ptr<InputStream>(NULL);
115 } 112 }
116 }; 113 };
117 114
118 class HeaderAlteringStreamReaderDelegate : public NullStreamReaderDelegate { 115 class HeaderAlteringStreamReaderDelegate : public NullStreamReaderDelegate {
119 public: 116 public:
120 HeaderAlteringStreamReaderDelegate() {} 117 HeaderAlteringStreamReaderDelegate() {}
121 118
122 virtual void AppendResponseHeaders( 119 void AppendResponseHeaders(JNIEnv* env,
123 JNIEnv* env, 120 net::HttpResponseHeaders* headers) override {
124 net::HttpResponseHeaders* headers) override {
125 headers->ReplaceStatusLine(kStatusLine); 121 headers->ReplaceStatusLine(kStatusLine);
126 std::string headerLine(kCustomHeaderName); 122 std::string headerLine(kCustomHeaderName);
127 headerLine.append(": "); 123 headerLine.append(": ");
128 headerLine.append(kCustomHeaderValue); 124 headerLine.append(kCustomHeaderValue);
129 headers->AddHeader(headerLine); 125 headers->AddHeader(headerLine);
130 } 126 }
131 127
132 static const int kResponseCode; 128 static const int kResponseCode;
133 static const char* kStatusLine; 129 static const char* kStatusLine;
134 static const char* kCustomHeaderName; 130 static const char* kCustomHeaderName;
(...skipping 25 matching lines...) Expand all
160 net::NetworkDelegate* network_delegate, 156 net::NetworkDelegate* network_delegate,
161 scoped_ptr<Delegate> delegate, 157 scoped_ptr<Delegate> delegate,
162 scoped_ptr<InputStreamReader> stream_reader) 158 scoped_ptr<InputStreamReader> stream_reader)
163 : AndroidStreamReaderURLRequestJob(request, 159 : AndroidStreamReaderURLRequestJob(request,
164 network_delegate, 160 network_delegate,
165 delegate.Pass()), 161 delegate.Pass()),
166 stream_reader_(stream_reader.Pass()) { 162 stream_reader_(stream_reader.Pass()) {
167 message_loop_proxy_ = base::MessageLoopProxy::current(); 163 message_loop_proxy_ = base::MessageLoopProxy::current();
168 } 164 }
169 165
170 virtual scoped_ptr<InputStreamReader> CreateStreamReader( 166 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.
171 InputStream* stream) override { 167 InputStream* stream) override {
172 return stream_reader_.Pass(); 168 return stream_reader_.Pass();
173 } 169 }
174 protected: 170 protected:
175 virtual ~TestStreamReaderJob() {} 171 ~TestStreamReaderJob() override {}
176 172
177 virtual base::TaskRunner* GetWorkerThreadRunner() override { 173 base::TaskRunner* GetWorkerThreadRunner() override {
178 return message_loop_proxy_.get(); 174 return message_loop_proxy_.get();
179 } 175 }
180 176
181 scoped_ptr<InputStreamReader> stream_reader_; 177 scoped_ptr<InputStreamReader> stream_reader_;
182 scoped_refptr<base::MessageLoopProxy> message_loop_proxy_; 178 scoped_refptr<base::MessageLoopProxy> message_loop_proxy_;
183 }; 179 };
184 180
185 class AndroidStreamReaderURLRequestJobTest : public Test { 181 class AndroidStreamReaderURLRequestJobTest : public Test {
186 public: 182 public:
187 AndroidStreamReaderURLRequestJobTest() {} 183 AndroidStreamReaderURLRequestJobTest() {}
188 184
189 protected: 185 protected:
190 virtual void SetUp() { 186 void SetUp() override {
191 context_.set_job_factory(&factory_); 187 context_.set_job_factory(&factory_);
192 context_.set_network_delegate(&network_delegate_); 188 context_.set_network_delegate(&network_delegate_);
193 req_ = context_.CreateRequest(GURL("content://foo"), 189 req_ = context_.CreateRequest(GURL("content://foo"),
194 net::DEFAULT_PRIORITY, 190 net::DEFAULT_PRIORITY,
195 &url_request_delegate_, 191 &url_request_delegate_,
196 NULL); 192 NULL);
197 req_->set_method("GET"); 193 req_->set_method("GET");
198 } 194 }
199 195
200 void SetRange(net::URLRequest* req, int first_byte, int last_byte) { 196 void SetRange(net::URLRequest* req, int first_byte, int last_byte) {
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
410 406
411 SetRange(req_.get(), offset, bytes_available); 407 SetRange(req_.get(), offset, bytes_available);
412 req_->Start(); 408 req_->Start();
413 409
414 loop.Run(); 410 loop.Run();
415 411
416 EXPECT_EQ(0, network_delegate_.completed_requests()); 412 EXPECT_EQ(0, network_delegate_.completed_requests());
417 req_->Cancel(); 413 req_->Cancel();
418 EXPECT_EQ(1, network_delegate_.completed_requests()); 414 EXPECT_EQ(1, network_delegate_.completed_requests());
419 } 415 }
OLDNEW
« no previous file with comments | « android_webview/browser/net/android_stream_reader_url_request_job.h ('k') | android_webview/browser/net/aw_network_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698