Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / android_webview / browser / net / android_stream_reader_url_request_job_unittest.cc

diff --git a/src/android_webview/browser/net/android_stream_reader_url_request_job_unittest.cc b/src/android_webview/browser/net/android_stream_reader_url_request_job_unittest.cc
index ec67bbf..4b80c41 100644 (file)
--- a/src/android_webview/browser/net/android_stream_reader_url_request_job_unittest.cc
+++ b/src/android_webview/browser/net/android_stream_reader_url_request_job_unittest.cc
@@ -52,15 +52,15 @@ class NotImplInputStream : public InputStream {
  public:
   NotImplInputStream() {}
   virtual ~NotImplInputStream() {}
-  virtual bool BytesAvailable(int* bytes_available) const OVERRIDE {
+  virtual bool BytesAvailable(int* bytes_available) const override {
     NOTIMPLEMENTED();
     return false;
   }
-  virtual bool Skip(int64_t n, int64_t* bytes_skipped) OVERRIDE {
+  virtual 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 {
+  virtual bool Read(net::IOBuffer* dest, int length, int* bytes_read) override {
     NOTIMPLEMENTED();
     return false;
   }
@@ -74,32 +74,32 @@ class StreamReaderDelegate :
 
   virtual scoped_ptr<InputStream> OpenInputStream(
       JNIEnv* env,
-      const GURL& url) OVERRIDE {
+      const GURL& url) override {
     return make_scoped_ptr<InputStream>(new NotImplInputStream());
   }
 
   virtual void OnInputStreamOpenFailed(net::URLRequest* request,
-                                       bool* restart) OVERRIDE {
+                                       bool* restart) override {
     *restart = false;
   }
 
   virtual bool GetMimeType(JNIEnv* env,
                            net::URLRequest* request,
                            android_webview::InputStream* stream,
-                           std::string* mime_type) OVERRIDE {
+                           std::string* mime_type) override {
     return false;
   }
 
   virtual bool GetCharset(JNIEnv* env,
                           net::URLRequest* request,
                           android_webview::InputStream* stream,
-                          std::string* charset) OVERRIDE {
+                          std::string* charset) override {
     return false;
   }
 
   virtual void AppendResponseHeaders(
       JNIEnv* env,
-      net::HttpResponseHeaders* headers) OVERRIDE {
+      net::HttpResponseHeaders* headers) override {
     // no-op
   }
 };
@@ -110,7 +110,7 @@ class NullStreamReaderDelegate : public StreamReaderDelegate {
 
   virtual scoped_ptr<InputStream> OpenInputStream(
       JNIEnv* env,
-      const GURL& url) OVERRIDE {
+      const GURL& url) override {
     return make_scoped_ptr<InputStream>(NULL);
   }
 };
@@ -121,7 +121,7 @@ class HeaderAlteringStreamReaderDelegate : public NullStreamReaderDelegate {
 
   virtual void AppendResponseHeaders(
       JNIEnv* env,
-      net::HttpResponseHeaders* headers) OVERRIDE {
+      net::HttpResponseHeaders* headers) override {
     headers->ReplaceStatusLine(kStatusLine);
     std::string headerLine(kCustomHeaderName);
     headerLine.append(": ");
@@ -168,13 +168,13 @@ class TestStreamReaderJob : public AndroidStreamReaderURLRequestJob {
   }
 
   virtual scoped_ptr<InputStreamReader> CreateStreamReader(
-      InputStream* stream) OVERRIDE {
+      InputStream* stream) override {
     return stream_reader_.Pass();
   }
  protected:
   virtual ~TestStreamReaderJob() {}
 
-  virtual base::TaskRunner* GetWorkerThreadRunner() OVERRIDE {
+  virtual base::TaskRunner* GetWorkerThreadRunner() override {
     return message_loop_proxy_.get();
   }
 
@@ -207,8 +207,7 @@ class AndroidStreamReaderURLRequestJobTest : public Test {
 
   void SetUpTestJob(scoped_ptr<InputStreamReader> stream_reader) {
     SetUpTestJob(stream_reader.Pass(),
-                 make_scoped_ptr(new StreamReaderDelegate())
-                     .PassAs<AndroidStreamReaderURLRequestJob::Delegate>());
+                 make_scoped_ptr(new StreamReaderDelegate()));
   }
 
   void SetUpTestJob(scoped_ptr<InputStreamReader> stream_reader,
@@ -251,7 +250,7 @@ TEST_F(AndroidStreamReaderURLRequestJobTest, ReadEmptyStream) {
         .WillOnce(Return(0));
   }
 
-  SetUpTestJob(stream_reader.PassAs<InputStreamReader>());
+  SetUpTestJob(stream_reader.Pass());
 
   req_->Start();
 
@@ -265,9 +264,7 @@ TEST_F(AndroidStreamReaderURLRequestJobTest, ReadEmptyStream) {
 }
 
 TEST_F(AndroidStreamReaderURLRequestJobTest, ReadWithNullStream) {
-  SetUpTestJob(scoped_ptr<InputStreamReader>(),
-               make_scoped_ptr(new NullStreamReaderDelegate())
-                   .PassAs<AndroidStreamReaderURLRequestJob::Delegate>());
+  SetUpTestJob(nullptr, make_scoped_ptr(new NullStreamReaderDelegate()));
   req_->Start();
 
   // The TestDelegate will quit the message loop on request completion.
@@ -283,9 +280,8 @@ TEST_F(AndroidStreamReaderURLRequestJobTest, ReadWithNullStream) {
 }
 
 TEST_F(AndroidStreamReaderURLRequestJobTest, ModifyHeadersAndStatus) {
-  SetUpTestJob(scoped_ptr<InputStreamReader>(),
-               make_scoped_ptr(new HeaderAlteringStreamReaderDelegate())
-                   .PassAs<AndroidStreamReaderURLRequestJob::Delegate>());
+  SetUpTestJob(nullptr,
+               make_scoped_ptr(new HeaderAlteringStreamReaderDelegate()));
   req_->Start();
 
   // The TestDelegate will quit the message loop on request completion.
@@ -329,7 +325,7 @@ TEST_F(AndroidStreamReaderURLRequestJobTest, ReadPartOfStream) {
         .WillOnce(Return(0));
   }
 
-  SetUpTestJob(stream_reader.PassAs<InputStreamReader>());
+  SetUpTestJob(stream_reader.Pass());
 
   SetRange(req_.get(), offset, bytes_available);
   req_->Start();
@@ -360,7 +356,7 @@ TEST_F(AndroidStreamReaderURLRequestJobTest,
         .WillOnce(Return(0));
   }
 
-  SetUpTestJob(stream_reader.PassAs<InputStreamReader>());
+  SetUpTestJob(stream_reader.Pass());
 
   SetRange(req_.get(), offset, bytes_available_reported);
   req_->Start();
@@ -385,7 +381,7 @@ TEST_F(AndroidStreamReaderURLRequestJobTest, DeleteJobMidWaySeek) {
   ON_CALL(*stream_reader, ReadRawData(_, _))
       .WillByDefault(Return(0));
 
-  SetUpTestJob(stream_reader.PassAs<InputStreamReader>());
+  SetUpTestJob(stream_reader.Pass());
 
   SetRange(req_.get(), offset, bytes_available);
   req_->Start();
@@ -410,7 +406,7 @@ TEST_F(AndroidStreamReaderURLRequestJobTest, DeleteJobMidWayRead) {
       .WillOnce(DoAll(InvokeWithoutArgs(&loop, &base::RunLoop::Quit),
                       Return(bytes_available)));
 
-  SetUpTestJob(stream_reader.PassAs<InputStreamReader>());
+  SetUpTestJob(stream_reader.Pass());
 
   SetRange(req_.get(), offset, bytes_available);
   req_->Start();