Move base/system_monitor/* to base/system/

This is a first step in moving the system-wide metric measurement code out of base/process/ TBR: jam@chromium.org, dalecurtis@chromium.org Bug: 891864 Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel Change-Id: I615190d5413937640a7bd29b68b18028445e4c88 Reviewed-on: https://chromium-review.googlesource.com/c/1260003 Reviewed-by: Dale Curtis <dalecurtis@chromium.org> Reviewed-by: Takashi Toyoshima <toyoshim@chromium.org> Reviewed-by: François Doray <fdoray@chromium.org> Commit-Queue: Sébastien Marchand <sebmarchand@chromium.org> Cr-Commit-Position: refs/heads/master@{#597136}
Denger-Network · Oct 5, 2018 · 0f56c3c · 0f56c3c
1 parent 8c68384
commit 0f56c3c
Show file tree

Hide file tree

Showing 22 changed files with 29 additions and 31 deletions.
diff --git a/base/BUILD.gn b/base/BUILD.gn
@@ -730,8 +730,8 @@ jumbo_component("base") {
     #"sys_info_openbsd.cc",  # Unused in Chromium build.
     "syslog_logging.cc",
     "syslog_logging.h",
-    "system_monitor/system_monitor.cc",
-    "system_monitor/system_monitor.h",
+    "system/system_monitor.cc",
+    "system/system_monitor.h",
     "task/cancelable_task_tracker.cc",
     "task/cancelable_task_tracker.h",
     "task/lazy_task_runner.cc",
@@ -2434,7 +2434,7 @@ test("base_unittests") {
     "synchronization/waitable_event_watcher_unittest.cc",
     "sys_byteorder_unittest.cc",
     "sys_info_unittest.cc",
-    "system_monitor/system_monitor_unittest.cc",
+    "system/system_monitor_unittest.cc",
     "task/cancelable_task_tracker_unittest.cc",
     "task/lazy_task_runner_unittest.cc",
     "task/post_task_unittest.cc",

diff --git a/base/system_monitor/system_monitor.cc → base/system/system_monitor.cc b/base/system_monitor/system_monitor.cc → base/system/system_monitor.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 "base/system_monitor/system_monitor.h"
+#include "base/system/system_monitor.h"
 
 #include <utility>
 
@@ -14,7 +14,7 @@ namespace base {
 static SystemMonitor* g_system_monitor = nullptr;
 
 SystemMonitor::SystemMonitor()
-    :  devices_changed_observer_list_(
+    : devices_changed_observer_list_(
           new ObserverListThreadSafe<DevicesChangedObserver>()) {
   DCHECK(!g_system_monitor);
   g_system_monitor = this;

diff --git a/base/system_monitor/system_monitor.h → base/system/system_monitor.h b/base/system_monitor/system_monitor.h → base/system/system_monitor.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 BASE_SYSTEM_MONITOR_SYSTEM_MONITOR_H_
-#define BASE_SYSTEM_MONITOR_SYSTEM_MONITOR_H_
+#ifndef BASE_SYSTEM_SYSTEM_MONITOR_H_
+#define BASE_SYSTEM_SYSTEM_MONITOR_H_
 
 #include "base/base_export.h"
 #include "base/macros.h"
@@ -64,12 +64,12 @@ class BASE_EXPORT SystemMonitor {
   // Functions to trigger notifications.
   void NotifyDevicesChanged(DeviceType device_type);
 
-  scoped_refptr<ObserverListThreadSafe<DevicesChangedObserver> >
+  scoped_refptr<ObserverListThreadSafe<DevicesChangedObserver>>
       devices_changed_observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(SystemMonitor);
 };
 
 }  // namespace base
 
-#endif  // BASE_SYSTEM_MONITOR_SYSTEM_MONITOR_H_
+#endif  // BASE_SYSTEM_SYSTEM_MONITOR_H_
diff --git a/...system_monitor/system_monitor_unittest.cc → base/system/system_monitor_unittest.cc b/...system_monitor/system_monitor_unittest.cc → base/system/system_monitor_unittest.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 "base/system_monitor/system_monitor.h"
+#include "base/system/system_monitor.h"
 
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
@@ -17,9 +17,7 @@ namespace {
 
 class SystemMonitorTest : public testing::Test {
  protected:
-  SystemMonitorTest() {
-    system_monitor_.reset(new SystemMonitor);
-  }
+  SystemMonitorTest() { system_monitor_.reset(new SystemMonitor); }
 
   MessageLoop message_loop_;
   std::unique_ptr<SystemMonitor> system_monitor_;

diff --git a/base/test/mock_devices_changed_observer.h b/base/test/mock_devices_changed_observer.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "base/macros.h"
-#include "base/system_monitor/system_monitor.h"
+#include "base/system/system_monitor.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace base {

diff --git a/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.h b/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.h
@@ -11,7 +11,7 @@
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "base/system_monitor/system_monitor.h"
+#include "base/system/system_monitor.h"
 #include "chrome/browser/extensions/chrome_extension_function.h"
 #include "chrome/common/extensions/api/webrtc_audio_private.h"
 #include "content/public/browser/render_process_host.h"

diff --git a/chromeos/audio/cras_audio_handler.cc b/chromeos/audio/cras_audio_handler.cc
@@ -17,7 +17,7 @@
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/sys_info.h"
-#include "base/system_monitor/system_monitor.h"
+#include "base/system/system_monitor.h"
 #include "chromeos/audio/audio_devices_pref_handler_stub.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 

diff --git a/chromeos/audio/cras_audio_handler_unittest.cc b/chromeos/audio/cras_audio_handler_unittest.cc
@@ -14,7 +14,7 @@
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/run_loop.h"
-#include "base/system_monitor/system_monitor.h"
+#include "base/system/system_monitor.h"
 #include "base/test/scoped_task_environment.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/values.h"

diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
@@ -37,7 +37,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/synchronization/waitable_event.h"
-#include "base/system_monitor/system_monitor.h"
+#include "base/system/system_monitor.h"
 #include "base/task/post_task.h"
 #include "base/task/task_scheduler/initialization_util.h"
 #include "base/threading/thread.h"

diff --git a/content/browser/renderer_host/media/media_devices_manager.h b/content/browser/renderer_host/media/media_devices_manager.h
@@ -15,7 +15,7 @@
 #include "base/containers/flat_map.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
-#include "base/system_monitor/system_monitor.h"
+#include "base/system/system_monitor.h"
 #include "content/browser/media/media_devices_util.h"
 #include "content/common/content_export.h"
 #include "content/common/media/media_devices.h"

diff --git a/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc b/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc
@@ -16,7 +16,7 @@
 #include "base/containers/queue.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
-#include "base/system_monitor/system_monitor.h"
+#include "base/system/system_monitor.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "content/browser/renderer_host/media/audio_input_device_manager.h"

diff --git a/device/gamepad/gamepad_provider.h b/device/gamepad/gamepad_provider.h
@@ -14,7 +14,7 @@
 #include "base/memory/read_only_shared_memory_region.h"
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/lock.h"
-#include "base/system_monitor/system_monitor.h"
+#include "base/system/system_monitor.h"
 #include "base/time/time.h"
 #include "device/gamepad/gamepad_export.h"
 #include "device/gamepad/gamepad_pad_state_provider.h"

diff --git a/media/audio/win/audio_device_listener_win.cc b/media/audio/win/audio_device_listener_win.cc
@@ -8,7 +8,7 @@
 
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/system_monitor/system_monitor.h"
+#include "base/system/system_monitor.h"
 #include "base/time/default_tick_clock.h"
 #include "base/win/scoped_co_mem.h"
 #include "base/win/windows_version.h"

diff --git a/media/device_monitors/device_monitor_mac.h b/media/device_monitors/device_monitor_mac.h
@@ -9,7 +9,7 @@
 
 #include "base/macros.h"
 #include "base/single_thread_task_runner.h"
-#include "base/system_monitor/system_monitor.h"
+#include "base/system/system_monitor.h"
 #include "base/threading/thread_checker.h"
 #include "media/base/media_export.h"
 

diff --git a/media/device_monitors/device_monitor_udev.cc b/media/device_monitors/device_monitor_udev.cc
@@ -11,7 +11,7 @@
 #include <string>
 
 #include "base/macros.h"
-#include "base/system_monitor/system_monitor.h"
+#include "base/system/system_monitor.h"
 #include "device/udev_linux/udev.h"
 #include "device/udev_linux/udev_linux.h"
 

diff --git a/media/device_monitors/system_message_window_win.cc b/media/device_monitors/system_message_window_win.cc
@@ -9,7 +9,7 @@
 
 #include "base/logging.h"
 #include "base/macros.h"
-#include "base/system_monitor/system_monitor.h"
+#include "base/system/system_monitor.h"
 #include "base/win/wrapped_window_proc.h"
 #include "media/audio/win/core_audio_util_win.h"
 

diff --git a/media/device_monitors/system_message_window_win_unittest.cc b/media/device_monitors/system_message_window_win_unittest.cc
@@ -11,7 +11,7 @@
 #include "base/files/file_path.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
-#include "base/system_monitor/system_monitor.h"
+#include "base/system/system_monitor.h"
 #include "base/test/mock_devices_changed_observer.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"

diff --git a/media/midi/midi_manager_unittest.cc b/media/midi/midi_manager_unittest.cc
@@ -16,7 +16,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
-#include "base/system_monitor/system_monitor.h"
+#include "base/system/system_monitor.h"
 #include "build/build_config.h"
 #include "media/midi/midi_service.h"
 #include "testing/gtest/include/gtest/gtest.h"

diff --git a/media/midi/midi_manager_win.h b/media/midi/midi_manager_win.h
@@ -11,7 +11,7 @@
 #include "base/callback_forward.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "base/system_monitor/system_monitor.h"
+#include "base/system/system_monitor.h"
 #include "media/midi/midi_manager.h"
 
 namespace base {

diff --git a/services/audio/device_notifier.h b/services/audio/device_notifier.h
@@ -8,7 +8,7 @@
 #include <memory>
 
 #include "base/containers/flat_map.h"
-#include "base/system_monitor/system_monitor.h"
+#include "base/system/system_monitor.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "services/audio/public/mojom/device_notifications.mojom.h"
 #include "services/audio/traced_service_ref.h"

diff --git a/services/audio/device_notifier_unittest.cc b/services/audio/device_notifier_unittest.cc
@@ -7,7 +7,7 @@
 #include <memory>
 #include <utility>
 
-#include "base/system_monitor/system_monitor.h"
+#include "base/system/system_monitor.h"
 #include "base/test/scoped_task_environment.h"
 #include "services/audio/public/mojom/device_notifications.mojom.h"
 #include "services/audio/traced_service_ref.h"

diff --git a/services/audio/service.cc b/services/audio/service.cc
@@ -9,7 +9,7 @@
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/single_thread_task_runner.h"
-#include "base/system_monitor/system_monitor.h"
+#include "base/system/system_monitor.h"
 #include "base/time/default_tick_clock.h"
 #include "base/trace_event/trace_event.h"
 #include "media/audio/audio_manager.h"