media: Fix ODR violations for chromeos.

TBR=piman@chromium.org

Bug: 938765
Change-Id: Ic1c54b3a489fc056f43d7d2f353e418645a9d33c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1508923Reviewed-by: Khushal <khushalsagar@chromium.org>
Reviewed-by: Antoine Labour <piman@chromium.org>
Commit-Queue: Khushal <khushalsagar@chromium.org>
Cr-Commit-Position: refs/heads/master@{#638726}

components/viz/common/BUILD.gn

@@ -214,7 +214,6 @@ viz_component("common") {
     "//gpu/command_buffer/client:gles2_interface",
     "//gpu/command_buffer/client:raster",
     "//gpu/command_buffer/client:raster_interface",
-    "//gpu/config",
     "//gpu/vulkan:buildflags",
     "//mojo/public/cpp/system",
     "//third_party/libyuv",
@@ -235,6 +234,10 @@ viz_component("common") {
     deps += [ "//ui/base" ]
   }
 
+  if (is_android) {
+    deps += [ "//gpu/config" ]
+  }
+
   if (is_chromecast) {
     defines += [ "IS_CHROMECAST" ]
   }

components/viz/common/features.cc

@@ -7,7 +7,10 @@
 #include "base/command_line.h"
 #include "build/build_config.h"
 #include "components/viz/common/switches.h"
-#include "gpu/config/gpu_finch_features.h"
+
+#if defined(OS_ANDROID)
+#include "gpu/config/gpu_finch_features.h"  // nogncheck
+#endif
 
 namespace features {