Cleanup //ui/compositor deps on viz

//ui/compositor doesn't need a dependency on //components/viz/service.
Only test code should have the dependency at this point. Remove unused
includes and dependency.

Also make //components/viz/service and //components/viz/host have a
public_dep on //components/viz/common. //components/viz/client already
has the appropriate public_dep.

Bug: 936425
Change-Id: Icbcb2a23a897be68c09d8a544a2cc29243b1ea53
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2000330Reviewed-by: Sean Gilhuly <sgilhuly@chromium.org>
Commit-Queue: kylechar <kylechar@chromium.org>
Cr-Commit-Position: refs/heads/master@{#732453}

components/viz/host/BUILD.gn

@@ -43,7 +43,6 @@ viz_component("host") {
   deps = [
     "//base",
     "//components/ui_devtools:buildflags",
-    "//components/viz/common",
     "//gpu/ipc/client",
     "//gpu/ipc/common",
     "//services/viz/privileged/mojom",
@@ -56,6 +55,7 @@ viz_component("host") {
   ]
 
   public_deps = [
+    "//components/viz/common",
     "//gpu/command_buffer/client",
     "//gpu/ipc/host",
     "//services/viz/privileged/mojom/compositing",

components/viz/service/BUILD.gn

@@ -181,7 +181,6 @@ viz_component("service") {
     "//cc/base",
     "//cc/paint",
     "//components/crash/core/common:crash_key",
-    "//components/viz/common",
     "//gpu/command_buffer/client:gles2_cmd_helper",
     "//gpu/command_buffer/client:gles2_implementation",
     "//gpu/command_buffer/client:raster",
@@ -207,6 +206,7 @@ viz_component("service") {
     "//base",
     "//cc",
     "//cc/debug",
+    "//components/viz/common",
     "//gpu/command_buffer/client:gles2_interface",
     "//services/viz/privileged/mojom/compositing",
     "//services/viz/public/mojom",

ui/compositor/BUILD.gn

@@ -95,7 +95,6 @@ jumbo_component("compositor") {
     "//cc/animation",
     "//cc/paint",
     "//components/viz/host",
-    "//components/viz/service",
     "//gpu/command_buffer/common",
     "//skia",
     "//ui/base",
@@ -239,7 +238,6 @@ test("compositor_unittests") {
     "//cc",
     "//cc:test_support",
     "//components/viz/common",
-    "//components/viz/service",
     "//components/viz/test:test_support",
     "//mojo/core/embedder",
     "//skia",

ui/compositor/DEPS

@@ -2,7 +2,6 @@ include_rules = [
   "+cc",
   "+components/viz/common",
   "+components/viz/host",
-  "+components/viz/service",
   "+gpu/command_buffer/client/gles2_interface.h",
   "+mojo/public/cpp/bindings/pending_remote.h",
   "+services/viz/privileged/mojom/compositing",
@@ -27,4 +26,3 @@ specific_include_rules = {
     "+components/viz/test",
   ],
 }
-

ui/compositor/compositor.cc

@@ -37,7 +37,6 @@
 #include "components/viz/common/switches.h"
 #include "components/viz/host/host_frame_sink_manager.h"
 #include "components/viz/host/renderer_settings_creation.h"
-#include "components/viz/service/frame_sinks/frame_sink_manager_impl.h"
 #include "services/viz/privileged/mojom/compositing/vsync_parameter_observer.mojom.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/ui_base_features.h"

ui/compositor/compositor_unittest.cc

@@ -11,10 +11,7 @@
 #include "base/test/test_mock_time_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/time/time.h"
-#include "components/viz/common/frame_sinks/begin_frame_args.h"
 #include "components/viz/common/surfaces/parent_local_surface_id_allocator.h"
-#include "components/viz/service/surfaces/surface_manager.h"
-#include "components/viz/test/begin_frame_args_test.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/compositor/compositor.h"

ui/compositor/test/DEPS

 include_rules = [
   "+components/viz/common/gpu",
-  "+components/viz/service/display",
-  "+components/viz/service/frame_sinks",
+  "+components/viz/service",
   "+components/viz/test",
   "+gpu/command_buffer/client",
   "+gpu/command_buffer/common",