Fix for a DCHECK in GpuSurfaceLookup

gpu/ipc/common/BUILD.gn

 # Copyright 2016 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.
 
 import("//build/config/ui.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 
 group("common") {
   if (is_component_build) {
     public_deps = [
@@ skipping 56 matching lines @@
   sources = [
     "gpu_memory_buffer_support.cc",
     "gpu_memory_buffer_support.h",
     "gpu_message_generator.cc",
     "gpu_message_generator.h",
     "gpu_messages.h",
     "gpu_param_traits.cc",
     "gpu_param_traits.h",
     "gpu_param_traits_macros.h",
     "gpu_stream_constants.h",
-    "gpu_surface_lookup.cc",
-    "gpu_surface_lookup.h",
     "memory_stats.cc",
     "memory_stats.h",
   ]
 
   configs += [
     "//gpu:gpu_implementation",
     "//third_party/khronos:khronos_headers",
   ]
 
   public_deps = [
@@ skipping 19 matching lines @@
     sources += [
       "android/scoped_surface_request_conduit.cc",
       "android/scoped_surface_request_conduit.h",
       "android/surface_texture_manager.cc",
       "android/surface_texture_manager.h",
       "android/surface_texture_peer.cc",
       "android/surface_texture_peer.h",
     ]
   }
 
+  if (is_mac || is_android) {
+    sources += [
+      "gpu_surface_lookup.cc",
+      "gpu_surface_lookup.h",
+      "gpu_surface_tracker.cc",
+      "gpu_surface_tracker.h",
+    ]
+  }
+
   if (use_ozone) {
     deps += [ "//ui/ozone" ]
   }
 }
 
 # Depend on this to use surface_handle.h without pulling in all of gpu ipc.
 source_set("surface_handle_type") {
   public = [
     "surface_handle.h",
   ]
@@ skipping 38 matching lines @@
     "surface_handle_struct_traits.h",
     "sync_token_struct_traits.h",
   ]
   deps = [
     ":interfaces_shared_cpp_sources",
     ":surface_handle_type",
     "//gpu/command_buffer/common",
     "//mojo/public/cpp/bindings:bindings",
   ]
 }
-
-if (is_mac || is_android) {
-  source_set("gpu_surface_tracker") {
-    sources = [
-      "gpu_surface_tracker.cc",
-      "gpu_surface_tracker.h",
-    ]
-
-    deps = [
-      "//gpu/ipc/common",
-      "//ui/gl",
-    ]
-
-    if (is_android) {
-      libs = [ "android" ]
-    }
-  }
-}