WIP - Control the lifetime of RenderThreadManager from Java.

android_webview/native/android_webview_jni_registrar.cc

Index: android_webview/native/android_webview_jni_registrar.cc
diff --git a/android_webview/native/android_webview_jni_registrar.cc b/android_webview/native/android_webview_jni_registrar.cc
index cd353eca89ecf317e6ecf3085b69515f5e3fa1ac..078536918ec2c9a6e84dcb50202f5cb92921ef62 100644
--- a/android_webview/native/android_webview_jni_registrar.cc
+++ b/android_webview/native/android_webview_jni_registrar.cc
@@ -4,6 +4,7 @@
 
 #include "android_webview/native/android_webview_jni_registrar.h"
 
+#include "android_webview/browser/shared_renderer_state.h"
 #include "android_webview/native/android_protocol_handler.h"
 #include "android_webview/native/aw_autofill_client.h"
 #include "android_webview/native/aw_contents.h"
@@ -36,33 +37,34 @@
 namespace android_webview {
 
 static base::android::RegistrationMethod kWebViewRegisteredMethods[] = {
-  // Register JNI for android_webview classes.
-  { "AndroidProtocolHandler", RegisterAndroidProtocolHandler },
-  { "AwAutofillClient", RegisterAwAutofillClient },
-  { "AwContents", RegisterAwContents },
-  { "AwContentsBackgroundThreadClient",
-    RegisterAwContentsBackgroundThreadClient },
-  { "AwContentsClientBridge", RegisterAwContentsClientBridge },
-  { "AwContentsIoThreadClientImpl", RegisterAwContentsIoThreadClientImpl },
-  { "AwContentsStatics", RegisterAwContentsStatics },
-  { "AwDebug", RegisterAwDebug },
-  { "AwDevToolsServer", RegisterAwDevToolsServer },
-  { "AwFormDatabase", RegisterAwFormDatabase },
-  { "AwPicture", RegisterAwPicture },
-  { "AwSettings", RegisterAwSettings },
-  { "AwHttpAuthHandler", RegisterAwHttpAuthHandler },
-  { "AwMetricsServiceClient", RegisterAwMetricsServiceClient },
-  { "AwPdfExporter", RegisterAwPdfExporter },
-  { "AwPermissionRequest", RegisterAwPermissionRequest },
-  { "AwQuotaManagerBridge", RegisterAwQuotaManagerBridge },
-  { "AwResource", AwResource::RegisterAwResource },
-  { "AwWebContentsDelegate", RegisterAwWebContentsDelegate },
-  { "CookieManager", RegisterCookieManager },
-  { "AwWebResourceResponseImpl", RegisterAwWebResourceResponse },
-  { "InputStream", RegisterInputStream },
-  { "JavaBrowserViewRendererHelper", RegisterJavaBrowserViewRendererHelper },
-  { "AwMessagePortService", RegisterAwMessagePortService },
-  { "AwContentsLifecycleNotifier", RegisterAwContentsLifecycleNotifier },
+    // Register JNI for android_webview classes.
+    {"AndroidProtocolHandler", RegisterAndroidProtocolHandler},
+    {"AwAutofillClient", RegisterAwAutofillClient},
+    {"AwContents", RegisterAwContents},
+    {"AwContentsBackgroundThreadClient",
+     RegisterAwContentsBackgroundThreadClient},
+    {"AwContentsClientBridge", RegisterAwContentsClientBridge},
+    {"AwContentsIoThreadClientImpl", RegisterAwContentsIoThreadClientImpl},
+    {"AwContentsStatics", RegisterAwContentsStatics},
+    {"AwDebug", RegisterAwDebug},
+    {"AwDevToolsServer", RegisterAwDevToolsServer},
+    {"AwFormDatabase", RegisterAwFormDatabase},
+    {"AwPicture", RegisterAwPicture},
+    {"AwSettings", RegisterAwSettings},
+    {"AwHttpAuthHandler", RegisterAwHttpAuthHandler},
+    {"AwMetricsServiceClient", RegisterAwMetricsServiceClient},
+    {"AwPdfExporter", RegisterAwPdfExporter},
+    {"AwPermissionRequest", RegisterAwPermissionRequest},
+    {"AwQuotaManagerBridge", RegisterAwQuotaManagerBridge},
+    {"AwResource", AwResource::RegisterAwResource},
+    {"AwWebContentsDelegate", RegisterAwWebContentsDelegate},
+    {"CookieManager", RegisterCookieManager},
+    {"AwWebResourceResponseImpl", RegisterAwWebResourceResponse},
+    {"InputStream", RegisterInputStream},
+    {"JavaBrowserViewRendererHelper", RegisterJavaBrowserViewRendererHelper},
+    {"AwMessagePortService", RegisterAwMessagePortService},
+    {"AwContentsLifecycleNotifier", RegisterAwContentsLifecycleNotifier},
+    {"SharedRendererState", RegisterSharedRendererState},
 };
 
 bool RegisterJni(JNIEnv* env) {