Revert of Mandoline: Remove native_viewport.mojom

components/view_manager/native_viewport/platform_viewport_android.cc

Index: components/view_manager/native_viewport/platform_viewport_android.cc
diff --git a/components/view_manager/native_viewport/platform_viewport_android.cc b/components/view_manager/native_viewport/platform_viewport_android.cc
index f5d47be23d3ab45003180d295436b2b26ac290f8..ccca113fbce6631deebf12c52ac03e24e374d00f 100644
--- a/components/view_manager/native_viewport/platform_viewport_android.cc
+++ b/components/view_manager/native_viewport/platform_viewport_android.cc
@@ -8,7 +8,6 @@
 #include <android/native_window_jni.h>
 
 #include "base/android/jni_android.h"
-#include "components/view_manager/native_viewport/platform_viewport_headless.h"
 #include "jni/PlatformViewportAndroid_jni.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/input_events/input_events_type_converters.h"
@@ -99,8 +98,12 @@
                                              jint width,
                                              jint height,
                                              jfloat density) {
-  size_ = gfx::Size(static_cast<int>(width), static_cast<int>(height));
-  delegate_->OnMetricsChanged(size_, density);
+  metrics_ = mojo::ViewportMetrics::New();
+  metrics_->size = mojo::Size::New();
+  metrics_->size->width = static_cast<int>(width);
+  metrics_->size->height = static_cast<int>(height);
+  metrics_->device_pixel_ratio = density;
+  delegate_->OnMetricsChanged(metrics_.Clone());
 }
 
 bool PlatformViewportAndroid::TouchEvent(JNIEnv* env,
@@ -186,7 +189,7 @@
 }
 
 gfx::Size PlatformViewportAndroid::GetSize() {
-  return size_;
+  return metrics_->size.To<gfx::Size>();
 }
 
 void PlatformViewportAndroid::SetBounds(const gfx::Rect& bounds) {
@@ -205,11 +208,7 @@
 // PlatformViewport, public:
 
 // static
-scoped_ptr<PlatformViewport> PlatformViewport::Create(Delegate* delegate,
-                                                      bool headless) {
-  if (headless)
-    return PlatformViewportHeadless::Create(delegate);
-
+scoped_ptr<PlatformViewport> PlatformViewport::Create(Delegate* delegate) {
   return scoped_ptr<PlatformViewport>(
       new PlatformViewportAndroid(delegate)).Pass();
 }