Merge from Chromium at DEPS revision 278856

This commit was generated by merge_to_master.py.

Change-Id: If3807744d3e5d3ee84b897bd2d099a2b7ed2e7a3

1 files changed, 60 insertions, 0 deletions

diff --git a/android_webview/browser/aw_web_resource_response.h b/android_webview/browser/aw_web_resource_response.h
new file mode 100644
index 0000000000..34963606ff
--- /dev/null
+++ b/android_webview/browser/aw_web_resource_response.h
@@ -0,0 +1,60 @@
+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef ANDROID_WEBVIEW_BROWSER_INTERCEPTED_REQUEST_DATA_H_
+#define ANDROID_WEBVIEW_BROWSER_INTERCEPTED_REQUEST_DATA_H_
+
+#include <string>
+
+#include "base/android/jni_android.h"
+#include "base/memory/scoped_ptr.h"
+
+namespace net {
+class HttpResponseHeaders;
+class NetworkDelegate;
+class URLRequest;
+class URLRequestJob;
+}
+
+namespace android_webview {
+
+class InputStream;
+
+// This class represents the Java-side data that is to be used to complete a
+// particular URLRequest.
+class AwWebResourceResponse {
+ public:
+  virtual ~AwWebResourceResponse() {}
+
+  virtual scoped_ptr<InputStream> GetInputStream(JNIEnv* env) const = 0;
+  virtual bool GetMimeType(JNIEnv* env, std::string* mime_type) const = 0;
+  virtual bool GetCharset(JNIEnv* env, std::string* charset) const = 0;
+  virtual bool GetStatusInfo(JNIEnv* env,
+                             int* status_code,
+                             std::string* reason_phrase) const = 0;
+  // If true is returned then |headers| contain the headers, if false is
+  // returned |headers| were not updated.
+  virtual bool GetResponseHeaders(
+      JNIEnv* env,
+      net::HttpResponseHeaders* headers) const = 0;
+
+  // This creates a URLRequestJob for the |request| wich will read data from
+  // the |aw_web_resource_response| structure (instead of going to the network
+  // or to the cache).
+  // The newly created job takes ownership of |aw_web_resource_response|.
+  static net::URLRequestJob* CreateJobFor(
+      scoped_ptr<AwWebResourceResponse> aw_web_resource_response,
+      net::URLRequest* request,
+      net::NetworkDelegate* network_delegate);
+
+ protected:
+  AwWebResourceResponse() {}
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(AwWebResourceResponse);
+};
+
+} // namespace android_webview
+
+#endif  // ANDROID_WEBVIEW_BROWSER_INTERCEPTED_REQUEST_DATA_H_