Update GpuSurfaceTracker to include Android surfaces.

ui/compositor/test/in_process_context_factory.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/compositor/test/in_process_context_factory.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 314 matching lines @@
   gfx::AcceleratedWidget widget = compositor->widget();
 
   auto data = base::MakeUnique<PerCompositorData>();
   if (widget == gfx::kNullAcceleratedWidget) {
     data->surface_handle = gpu::kNullSurfaceHandle;
   } else {
 #if defined(GPU_SURFACE_HANDLE_IS_ACCELERATED_WINDOW)
     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
   }
 
   PerCompositorData* return_ptr = data.get();
   per_compositor_data_[compositor] = std::move(data);
   return return_ptr;
 }
 
 }  // namespace ui