[Chromecast] Correct some Cast dependencies in //chrome/browser/ui.

chrome/browser/ui/BUILD.gn

 # 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.
 
 import("//build/config/chromecast_build.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//build/split_static_library.gni")
 import("//chrome/common/features.gni")
@@ skipping 3305 matching lines @@
   if (enable_service_discovery) {
     sources += [
       "webui/local_discovery/local_discovery_ui.cc",
       "webui/local_discovery/local_discovery_ui.h",
       "webui/local_discovery/local_discovery_ui_handler.cc",
       "webui/local_discovery/local_discovery_ui_handler.h",
     ]
   }
 
   if (is_chromecast && is_linux) {
+    if (is_cast_desktop_build) {

[brettw, 2016/09/30 21:32:01]

Does your build set use_x11? If so, can we just move these to the use_x11 block
above?

[slan, 2016/10/03 23:42:57]

It doesn't. So I moved the violating source files inside a use_x11 block,
preventing the need for these additional dependencies altogether.

+      deps += [
+        "//ui/base/x",
+        "//ui/events/devices/x11",
+        "//ui/events/keycodes:x11",
+      ]
+    }
+
     # The Chromecast build sets toolkit_views to false but some targets in the
     # build still reference views. But this target is referenced on the Cast
     # bot (though not currently compiled) but is configured as Linux. This
     # necessitates these extra dependencies to pass "gn check".
     deps += [
       "//chrome/browser/media/router",
       "//components/web_modal",
-      "//ui/base/x",
-      "//ui/events/devices/x11",
-      "//ui/events/keycodes:x11",
       "//ui/views",
       "//ui/views/controls/webview",
     ]
   }
 }
 
 # In GYP this is part of test_support_common.
 static_library("test_support") {
   testonly = true
 
@@ skipping 72 matching lines @@
       "passwords/passwords_model_delegate_mock.cc",
       "passwords/passwords_model_delegate_mock.h",
     ]
     deps += [ "//chrome/test:test_support_ui" ]
   }
 
   if (enable_extensions) {
     deps += [ "//extensions/browser" ]
   }
 }