Fix for a DCHECK in GpuSurfaceLookup

gpu/ipc/common/BUILD.gn

Index: gpu/ipc/common/BUILD.gn
diff --git a/gpu/ipc/common/BUILD.gn b/gpu/ipc/common/BUILD.gn
index 842bfb83dfcfb9d7fa2b4893bb8ff8f667137e35..73136d7258c6614dcb1d96edfe2378976f924bfa 100644
--- a/gpu/ipc/common/BUILD.gn
+++ b/gpu/ipc/common/BUILD.gn
@@ -74,8 +74,6 @@ source_set("ipc_common_sources") {
     "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",
   ]
@@ -115,6 +113,15 @@ source_set("ipc_common_sources") {
     ]
   }
 
+  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" ]
   }
@@ -173,21 +180,3 @@ source_set("struct_traits") {
     "//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" ]
-    }
-  }
-}