Update GpuSurfaceTracker to include Android surfaces.

ui/compositor/test/in_process_context_factory.cc

Index: ui/compositor/test/in_process_context_factory.cc
diff --git a/ui/compositor/test/in_process_context_factory.cc b/ui/compositor/test/in_process_context_factory.cc
index aecb9b792c2f1a2993f2c0c00bf0d7080ee97b28..f96cbaf8d03a1abbf437fad04ad195a75837f3ec 100644
--- a/ui/compositor/test/in_process_context_factory.cc
+++ b/ui/compositor/test/in_process_context_factory.cc
@@ -332,7 +332,18 @@ InProcessContextFactory::CreatePerCompositorData(ui::Compositor* compositor) {
     data->surface_handle = widget;
 #else
     gpu::GpuSurfaceTracker* tracker = gpu::GpuSurfaceTracker::Get();
-    data->surface_handle = tracker->AddSurfaceForNativeWidget(widget);
+    data->surface_handle = tracker->AddSurfaceForNativeWidget(
+        gpu::GpuSurfaceTracker::SurfaceRecord(
+            widget
+#if defined(OS_ANDROID)
+            // We have to provide a surface too, but we don't have one.  For
+            // now, we don't proide it, since nobody should ask anyway.
+            // If we ever provide a valid surface here, then GpuSurfaceTracker
+            // can be more strict about enforcing it.
+            ,
+            nullptr
+#endif
+            ));
 #endif
   }