services/ui: Move some files into the client lib.

content/renderer/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/features.gni")
 import("//build/config/ui.gni")
 import("//content/renderer/renderer.gni")
 import("//media/media_options.gni")
 import("//third_party/webrtc/build/webrtc.gni")
 import("//tools/ipc_fuzzer/ipc_fuzzer.gni")
@@ skipping 87 matching lines @@
     "//ui/gl",
     "//ui/native_theme",
     "//ui/surface",
     "//v8",
   ]
   allow_circular_includes_from = []
 
   if (use_aura) {
     public_deps += [ "//content/renderer/mus" ]
     allow_circular_includes_from += [ "//content/renderer/mus" ]
-    deps += [ "//services/ui/common:mus_common" ]
+    deps += [ "//services/ui/public/cpp" ]
   }
 
   if (use_external_popup_menu) {
     sources += [
       "external_popup_menu.cc",
       "external_popup_menu.h",
     ]
   }
 
   if (is_mac) {
@@ skipping 151 matching lines @@
     # For the defines in mojo_media_config.
     public_configs = [ "//media/mojo/services:mojo_media_config" ]
   }
 
   if (!is_component_build) {
     public_deps = [
       ":renderer",
     ]
   }
 }