Merge Chromium at r65505: Initiliase the OpenSSL library.

See https://chromereview.prom.corp.google.com/2010002/

Change-Id: I16754f6f18a54350671a2226d4c8c69615c63812

diff --git a/WebKit/android/WebCoreSupport/ChromiumIncludes.h b/WebKit/android/WebCoreSupport/ChromiumIncludes.h
index 89d1a90..32966a4 100644 (file)
--- a/WebKit/android/WebCoreSupport/ChromiumIncludes.h
+++ b/WebKit/android/WebCoreSupport/ChromiumIncludes.h
@@ -45,6 +45,7 @@
 #undef LOG_ASSERT
 #endif
 
+#include <android/net/android_network_library_impl.h>
 #include <base/callback.h>
 #include <base/condition_variable.h>
 #include <base/lock.h>

diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp
index f63f043..d9f2836 100644 (file)
--- a/WebKit/android/jni/WebViewCore.cpp
+++ b/WebKit/android/jni/WebViewCore.cpp
@@ -34,6 +34,7 @@
 #include "CachedRoot.h"
 #include "Chrome.h"
 #include "ChromeClientAndroid.h"
+#include "ChromiumIncludes.h"
 #include "Color.h"
 #include "DatabaseTracker.h"
 #include "Document.h"
@@ -393,6 +394,10 @@ WebViewCore::WebViewCore(JNIEnv* env, jobject javaWebViewCore, WebCore::Frame* m
     reset(true);
 
     WebViewCore::addInstance(this);
+
+#if USE(CHROME_NETWORK_STACK)
+    AndroidNetworkLibraryImpl::InitWithApplicationContext(env, 0);
+#endif
 }
 
 WebViewCore::~WebViewCore()