Move registration of Java mojo interfaces to the new InterfaceRegistrar.

content/public/android/java/src/org/chromium/content/browser/InterfaceRegistrarImpl.java

Index: content/public/android/java/src/org/chromium/content/browser/InterfaceRegistrarImpl.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/InterfaceRegistrarImpl.java b/content/public/android/java/src/org/chromium/content/browser/InterfaceRegistrarImpl.java
index b1d920a97f8a9bfc25699749fbcdb504077b9c47..e65195c89de711109de6ffd79e5687c571294225 100644
--- a/content/public/android/java/src/org/chromium/content/browser/InterfaceRegistrarImpl.java
+++ b/content/public/android/java/src/org/chromium/content/browser/InterfaceRegistrarImpl.java
@@ -4,14 +4,23 @@
 
 package org.chromium.content.browser;
 
+import android.app.Activity;
 import android.content.Context;
 
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.content_public.browser.InterfaceRegistrar;
 import org.chromium.content_public.browser.WebContents;
+import org.chromium.device.battery.BatteryMonitorFactory;
+import org.chromium.device.nfc.NfcImpl;
+import org.chromium.device.vibration.VibrationManagerImpl;
 import org.chromium.mojo.system.impl.CoreImpl;
+import org.chromium.mojom.device.BatteryMonitor;
+import org.chromium.mojom.device.VibrationManager;
+import org.chromium.mojom.device.nfc.Nfc;
+import org.chromium.services.shell.InterfaceFactory;
 import org.chromium.services.shell.InterfaceRegistry;
+import org.chromium.ui.base.WindowAndroid;
 
 @JNINamespace("content")
 class InterfaceRegistrarImpl {
@@ -28,4 +37,77 @@ class InterfaceRegistrarImpl {
                 CoreImpl.getInstance().acquireNativeHandle(nativeHandle).toMessagePipeHandle());
         InterfaceRegistrar.Registry.applyWebContentsRegistrars(registry, webContents);
     }
+
+    static {

[boliu, 2016/09/22 14:32:18]

static blocks executes when the class is loaded by the jvm, and afaict, the only
thing loading this class is from these @CalledByNative methods. Is it possible
to just do this lazily from one of the CalledByNative methods? This is to avoid
having this run some other time if something else ends up loading this class

[Sam McNally, 2016/09/23 01:38:50]

Done.

+        InterfaceRegistrar.Registry.addContextRegistrar(new ContentContextInterfaceRegistrar());
+        InterfaceRegistrar.Registry.addWebContentsRegistrar(
+                new ContentWebContentsInterfaceRegistrar());
+    }
+}
+
+class ContentContextInterfaceRegistrar implements InterfaceRegistrar<Context> {

[boliu, 2016/09/22 14:32:18]

question, not really about this CL

<Context> means this interface has the lifetime of the Context? It says
applicationContext below, so that implies these interfaces are global, and never
cleaned up on android?

[Sam McNally, 2016/09/23 01:38:50]

Potentially yes; the interface lifetimes are controlled by the client. In
practice, the interface impls will usually live until the webpage, RenderFrame
or renderer process that requested it goes away.

+    @Override
+    public void registerInterfaces(InterfaceRegistry registry, final Context applicationContext) {
+        registry.addInterface(
+                VibrationManager.MANAGER, new VibrationManagerImpl.Factory(applicationContext));
+        registry.addInterface(
+                BatteryMonitor.MANAGER, new BatteryMonitorFactory(applicationContext));
+        // TODO(avayvod): Register the PresentationService implementation here.
+    }
+}
+
+class ContentWebContentsInterfaceRegistrar implements InterfaceRegistrar<WebContents> {
+    @Override
+    public void registerInterfaces(InterfaceRegistry registry, final WebContents webContents) {
+        registry.addInterface(Nfc.MANAGER, new NfcFactory(webContents));
+    }
+
+    // TODO(sammc): Move this into its own file.

[boliu, 2016/09/22 14:32:18]

why wait? you are moving this code in this CL already, just move it to its final
location?

[Sam McNally, 2016/09/23 01:38:50]

Done.

+    private static class NfcFactory implements InterfaceFactory<Nfc> {
+        private final WebContents mContents;
+
+        NfcFactory(WebContents contents) {
+            mContents = contents;
+        }
+
+        private static class ContextAwareNfcImpl
+                extends NfcImpl implements WindowAndroidChangedObserver {
+            private final ContentViewCore mContentViewCore;
+
+            ContextAwareNfcImpl(ContentViewCore contentViewCore) {
+                super(contentViewCore.getContext().getApplicationContext());
+                mContentViewCore = contentViewCore;
+                mContentViewCore.addWindowAndroidChangedObserver(this);
+                if (mContentViewCore.getWindowAndroid() != null) {
+                    setActivity(mContentViewCore.getWindowAndroid().getActivity().get());
+                }
+            }
+
+            @Override
+            public void close() {
+                super.close();
+                if (mContentViewCore != null) {
+                    mContentViewCore.removeWindowAndroidChangedObserver(this);
+                }
+            }
+
+            @Override
+            public void onWindowAndroidChanged(WindowAndroid newWindowAndroid) {
+                Activity activity = null;
+                if (newWindowAndroid != null) {
+                    activity = newWindowAndroid.getActivity().get();
+                }
+                setActivity(activity);
+            }
+        }
+
+        @Override
+        public Nfc createImpl() {
+            ContentViewCore contentViewCore = ContentViewCore.fromWebContents(mContents);
+            if (contentViewCore == null) {
+                return null;
+            }
+            return new ContextAwareNfcImpl(contentViewCore);
+        }
+    }
 }