Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / components / cronet / android / chromium_url_request_context.cc

diff --git a/src/components/cronet/android/chromium_url_request_context.cc b/src/components/cronet/android/chromium_url_request_context.cc
index f870adf..45fca43 100644 (file)
--- a/src/components/cronet/android/chromium_url_request_context.cc
+++ b/src/components/cronet/android/chromium_url_request_context.cc
@@ -31,7 +31,7 @@ class JniURLRequestContextAdapterDelegate
       : owner_(env->NewGlobalRef(owner)) {}
 
   virtual void OnContextInitialized(
-      cronet::URLRequestContextAdapter* context) OVERRIDE {
+      cronet::URLRequestContextAdapter* context) override {
     JNIEnv* env = base::android::AttachCurrentThread();
     cronet::Java_ChromiumUrlRequestContext_initNetworkThread(env, owner_);
     // TODO(dplotnikov): figure out if we need to detach from the thread.
@@ -147,4 +147,13 @@ static void StopNetLog(JNIEnv* env,
   adapter->StopNetLog();
 }
 
+// Called on application's main Java thread.
+static void InitRequestContextOnMainThread(JNIEnv* env,
+                                           jobject jcaller,
+                                           jlong url_request_context_adapter) {
+  URLRequestContextAdapter* adapter =
+      reinterpret_cast<URLRequestContextAdapter*>(url_request_context_adapter);
+  adapter->InitRequestContextOnMainThread();
+}
+
 }  // namespace cronet