Pulls display related changes from mojo to chrome

mojo/services/native_viewport/android/src/org/chromium/mojo/PlatformViewportAndroid.java

Index: mojo/services/native_viewport/android/src/org/chromium/mojo/PlatformViewportAndroid.java
diff --git a/mojo/services/native_viewport/android/src/org/chromium/mojo/PlatformViewportAndroid.java b/mojo/services/native_viewport/android/src/org/chromium/mojo/PlatformViewportAndroid.java
index 15eb96cbcf876632bf7c91725da553c888bdc851..189bc0760031ab593e89a0700ec2b4617e9eaab2 100644
--- a/mojo/services/native_viewport/android/src/org/chromium/mojo/PlatformViewportAndroid.java
+++ b/mojo/services/native_viewport/android/src/org/chromium/mojo/PlatformViewportAndroid.java
@@ -25,10 +25,12 @@ public class PlatformViewportAndroid extends SurfaceView {
     private long mNativeMojoViewport;
     private final SurfaceHolder.Callback mSurfaceCallback;
 
-    @SuppressWarnings("unused")
     @CalledByNative
-    public static void createForActivity(Activity activity, long nativeViewport) {
-        activity.setContentView(new PlatformViewportAndroid(activity, nativeViewport));
+    public static PlatformViewportAndroid createForActivity(
+            Activity activity, long nativeViewport) {
+        PlatformViewportAndroid rv = new PlatformViewportAndroid(activity, nativeViewport);
+        activity.setContentView(rv);
+        return rv;
     }
 
     public PlatformViewportAndroid(Context context, long nativeViewport) {
@@ -65,10 +67,9 @@ public class PlatformViewportAndroid extends SurfaceView {
 
     }
 
-    // TODO(abarth): Someone needs to call destroy at some point.
-    public void destroy() {
+    @CalledByNative
+    public void detach() {
         getHolder().removeCallback(mSurfaceCallback);
-        nativeDestroy(mNativeMojoViewport);
         mNativeMojoViewport = 0;
     }