Further starboard/common cleanup

b/322248408
youtube · May 31, 2024 · 73f21d4 · 73f21d4
1 parent 04a009e
commit 73f21d4
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 12 deletions.
diff --git a/chrome/updater/updater_module.cc b/chrome/updater/updater_module.cc
@@ -39,7 +39,6 @@
 #include "components/crx_file/crx_verifier.h"
 #include "components/update_client/cobalt_slot_management.h"
 #include "components/update_client/utils.h"
-#include "starboard/common/file.h"
 #include "starboard/configuration_constants.h"
 #include "starboard/extension/installation_manager.h"
 

diff --git a/chrome/updater/utils_test.cc b/chrome/updater/utils_test.cc
@@ -22,7 +22,6 @@
 #include "base/strings/strcat.h"
 #include "base/values.h"
 #include "gmock/gmock.h"
-#include "starboard/common/file.h"
 #include "starboard/directory.h"
 #include "starboard/extension/installation_manager.h"
 #include "starboard/file.h"

diff --git a/cobalt/script/v8c/v8c_engine.cc b/cobalt/script/v8c/v8c_engine.cc
@@ -25,7 +25,6 @@
 #include "cobalt/configuration/configuration.h"
 #include "cobalt/script/v8c/isolate_fellowship.h"
 #include "cobalt/script/v8c/v8c_global_environment.h"
-#include "starboard/common/once.h"
 
 namespace cobalt {
 namespace script {

diff --git a/cobalt/watchdog/watchdog.h b/cobalt/watchdog/watchdog.h
@@ -30,7 +30,6 @@
 #include "cobalt/persistent_storage/persistent_settings.h"
 #include "cobalt/watchdog/instrumentation_log.h"
 #include "cobalt/watchdog/singleton.h"
-#include "starboard/common/condition_variable.h"
 
 namespace cobalt {
 namespace watchdog {

diff --git a/components/update_client/cobalt_slot_management_test.cc b/components/update_client/cobalt_slot_management_test.cc
@@ -21,7 +21,6 @@
 
 #include "base/strings/string_util.h"
 #include "base/time/time.h"
-#include "starboard/common/file.h"
 #include "starboard/extension/free_space.h"
 #include "starboard/loader_app/app_key_files.h"
 #include "starboard/loader_app/drain_file.h"

diff --git a/net/proxy_resolution/proxy_config_service_linux.cc b/net/proxy_resolution/proxy_config_service_linux.cc
@@ -40,11 +40,6 @@
 #include <gio/gio.h>
 #endif  // defined(USE_GIO)
 
-#if defined(STARBOARD)
-#include "starboard/common/file.h"
-#include "starboard/types.h"
-#endif
-
 namespace net {
 
 class ScopedAllowBlockingForSettingGetter : public base::ScopedAllowBlocking {};

diff --git a/v8/src/base/platform/condition-variable.h b/v8/src/base/platform/condition-variable.h
@@ -11,7 +11,7 @@
 
 #if V8_OS_STARBOARD
 #if SB_API_VERSION < 16
-#include "starboard/common/condition_variable.h"
+#include "starboard/condition_variable.h"
 #else
 #include <pthread.h>
 #endif // SB_API_VERSION < 16

diff --git a/v8/src/base/platform/platform-starboard.cc b/v8/src/base/platform/platform-starboard.cc
@@ -17,7 +17,6 @@
 #include "src/base/timezone-cache.h"
 #include "src/base/utils/random-number-generator.h"
 #include "starboard/client_porting/eztime/eztime.h"
-#include "starboard/common/condition_variable.h"
 #include "starboard/common/log.h"
 #include "starboard/common/string.h"
 #include "starboard/common/time.h"