chromebox_for_meetings: Add sources to build file directly

Ease indirect dependency requirements by adding sources directly into
the main browser/chromeos build target

BUG=chromium:1105567, b:165864612
TEST='autoninja -C out/Default/ chrome/test:unit_tests \
     && xvfb-run ./out/Default/unit_tests \
     --gtest_filter=CfmServiceAdaptorTest.*'

Change-Id: Idc69f08b44e0fdd5c85895ed5b92a75226adb6d0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2495409Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Commit-Queue: Kyle Williams <kdgwill@chromium.org>
Cr-Commit-Position: refs/heads/master@{#821695}

chrome/browser/chromeos/BUILD.gn

@@ -388,12 +388,6 @@ source_set("chromeos") {
     "//ui/wm/public",
     "//url",
   ]
-  if (is_cfm) {
-    deps += [
-      "//chrome/browser/chromeos/chromebox_for_meetings",
-      "//chromeos/dbus/chromebox_for_meetings",
-    ]
-  }
   data_deps = [ ":dbus_service_files" ]
 
   allow_circular_includes_from = [
@@ -2997,6 +2991,22 @@ source_set("chromeos") {
   if (use_cras) {
     defines += [ "USE_CRAS" ]
   }
+
+  if (is_cfm) {
+    sources += [
+      "chromebox_for_meetings/browser/cfm_browser_service.cc",
+      "chromebox_for_meetings/browser/cfm_browser_service.h",
+      "chromebox_for_meetings/cfm_chrome_services.cc",
+      "chromebox_for_meetings/cfm_chrome_services.h",
+      "chromebox_for_meetings/service_adaptor.cc",
+      "chromebox_for_meetings/service_adaptor.h",
+    ]
+    deps += [
+      "//chromeos/components/chromebox_for_meetings/features",
+      "//chromeos/dbus/chromebox_for_meetings",
+      "//chromeos/services/chromebox_for_meetings/public/mojom",
+    ]
+  }
 }
 
 action("dbus_service_files") {
@@ -3951,9 +3961,17 @@ source_set("unit_tests") {
   if (use_udev) {
     deps += [ "//device/udev_linux:test_support" ]
   }
+
   if (is_cfm) {
-    deps += [ "//chrome/browser/chromeos/chromebox_for_meetings:unit_tests" ]
+    sources += [
+      "chromebox_for_meetings/fake_service_context.cc",
+      "chromebox_for_meetings/fake_service_context.h",
+      "chromebox_for_meetings/service_adaptor_unittest.cc",
+    ]
+    deps +=
+        [ "//chromeos/services/chromebox_for_meetings/public/cpp:test_support" ]
   }
+
   data = [ "//chromeos/test/data/" ]
 }
 

chrome/browser/chromeos/chromebox_for_meetings/BUILD.gn

-# Copyright 2020 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("//chromeos/components/chromebox_for_meetings/buildflags/buildflags.gni")
-
-assert(is_chromeos, "Non-ChromeOS builds cannot depend on //chromeos")
-assert(is_cfm, "Non-CfM builds cannot depend on this library")
-
-source_set("chromebox_for_meetings") {
-  sources = [
-    "cfm_browser_service.cc",
-    "cfm_browser_service.h",
-    "cfm_chrome_services.cc",
-    "cfm_chrome_services.h",
-    "service_adaptor.cc",
-    "service_adaptor.h",
-  ]
-  deps = [
-    "//chromeos/components/chromebox_for_meetings/features",
-    "//chromeos/services/chromebox_for_meetings/public/mojom",
-  ]
-  public_deps = [
-    "//base",
-    "//chromeos/dbus/chromebox_for_meetings",
-  ]
-}
-
-source_set("test_support") {
-  testonly = true
-  sources = [
-    "fake_service_context.cc",
-    "fake_service_context.h",
-  ]
-  deps = [
-    ":chromebox_for_meetings",
-    "//base",
-    "//chromeos/dbus/chromebox_for_meetings",
-    "//chromeos/services/chromebox_for_meetings/public/mojom",
-    "//mojo/public/cpp/bindings",
-  ]
-}
-
-source_set("unit_tests") {
-  testonly = true
-  sources = [ "service_adaptor_unittest.cc" ]
-  deps = [
-    ":chromebox_for_meetings",
-    ":test_support",
-    "//base/test:test_support",
-    "//chromeos/services/chromebox_for_meetings/public/cpp:test_support",
-    "//mojo/core/embedder",
-    "//mojo/public/cpp/bindings",
-    "//testing/gtest",
-  ]
-}

chrome/browser/chromeos/chromebox_for_meetings/cfm_browser_service.cc → chrome/browser/chromeos/chromebox_for_meetings/browser/cfm_browser_service.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/chromebox_for_meetings/cfm_browser_service.h"
+#include "chrome/browser/chromeos/chromebox_for_meetings/browser/cfm_browser_service.h"
 
 #include "base/bind.h"
 #include "base/macros.h"

chrome/browser/chromeos/chromebox_for_meetings/cfm_browser_service.h → chrome/browser/chromeos/chromebox_for_meetings/browser/cfm_browser_service.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_CHROMEBOX_FOR_MEETINGS_CFM_BROWSER_SERVICE_H_
-#define CHROME_BROWSER_CHROMEOS_CHROMEBOX_FOR_MEETINGS_CFM_BROWSER_SERVICE_H_
+#ifndef CHROME_BROWSER_CHROMEOS_CHROMEBOX_FOR_MEETINGS_BROWSER_CFM_BROWSER_SERVICE_H_
+#define CHROME_BROWSER_CHROMEOS_CHROMEBOX_FOR_MEETINGS_BROWSER_CFM_BROWSER_SERVICE_H_
 
 #include "base/memory/weak_ptr.h"
 #include "base/no_destructor.h"
@@ -51,4 +51,4 @@ class CfmBrowserService : public CfmObserver,
 }  // namespace cfm
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_CHROMEBOX_FOR_MEETINGS_CFM_BROWSER_SERVICE_H_
+#endif  // CHROME_BROWSER_CHROMEOS_CHROMEBOX_FOR_MEETINGS_BROWSER_CFM_BROWSER_SERVICE_H_

chrome/browser/chromeos/chromebox_for_meetings/cfm_chrome_services.cc

@@ -4,7 +4,7 @@
 
 #include "chrome/browser/chromeos/chromebox_for_meetings/cfm_chrome_services.h"
 
-#include "chrome/browser/chromeos/chromebox_for_meetings/cfm_browser_service.h"
+#include "chrome/browser/chromeos/chromebox_for_meetings/browser/cfm_browser_service.h"
 #include "chromeos/components/chromebox_for_meetings/features/features.h"
 #include "chromeos/dbus/chromebox_for_meetings/cfm_hotline_client.h"
 

chrome/browser/chromeos/chromebox_for_meetings/service_adaptor_unittest.cc

@@ -14,7 +14,6 @@
 #include "base/test/bind_test_util.h"
 #include "base/test/mock_callback.h"
 #include "base/test/task_environment.h"
-#include "chrome/browser/chromeos/chromebox_for_meetings/cfm_browser_service.h"
 #include "chrome/browser/chromeos/chromebox_for_meetings/fake_service_context.h"
 #include "chromeos/dbus/chromebox_for_meetings/cfm_hotline_client.h"
 #include "chromeos/services/chromebox_for_meetings/public/cpp/fake_service_connection.h"