Pulls display related changes from mojo to chrome

mojo/services/native_viewport/platform_viewport_android.h

Index: mojo/services/native_viewport/platform_viewport_android.h
diff --git a/mojo/services/native_viewport/platform_viewport_android.h b/mojo/services/native_viewport/platform_viewport_android.h
index ebfe949540c903304c57acbfbab30948b1e33707..b3a0b861dff5c3c21720476a2d4d7a0ada4ab353 100644
--- a/mojo/services/native_viewport/platform_viewport_android.h
+++ b/mojo/services/native_viewport/platform_viewport_android.h
@@ -6,7 +6,6 @@
 #define SERVICES_NATIVE_VIEWPORT_PLATFORM_VIEWPORT_ANDROID_H_
 
 #include "base/android/jni_weak_ref.h"
-#include "base/android/scoped_java_ref.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "mojo/services/native_viewport/platform_viewport.h"
@@ -68,7 +67,8 @@ class PlatformViewportAndroid : public PlatformViewport {
 
   void ReleaseWindow();
 
-  Delegate* delegate_;
+  Delegate* const delegate_;
+  JavaObjectWeakGlobalRef java_platform_viewport_android_;
   ANativeWindow* window_;
   mojo::ViewportMetricsPtr metrics_;
   ui::SequentialIDGenerator id_generator_;