Cherry pick PR #3317: Remove starboard/common/log.h from cobalt (#3409)

Refer to the original PR: #3317 Follow up to #3038 that cleans up unneeded includes for starboard/common/log.h b/322248899 Co-authored-by: Kaido Kert <[email protected]>
youtube · May 31, 2024 · abd31e7 · abd31e7
1 parent 08f5295
commit abd31e7
Show file tree

Hide file tree

Showing 20 changed files with 3 additions and 23 deletions.
diff --git a/base/files/file.cc b/base/files/file.cc
@@ -17,7 +17,6 @@
 #include "build/build_config.h"
 
 #if defined(STARBOARD)
-#include "starboard/common/log.h"
 #include "starboard/types.h"
 #elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)
 #include <errno.h>

diff --git a/base/files/file_starboard.cc b/base/files/file_starboard.cc
@@ -23,7 +23,6 @@
 #include "base/notreached.h"
 #include "base/strings/stringprintf.h"
 #include "base/threading/thread_restrictions.h"
-#include "starboard/common/log.h"
 #include "starboard/common/metrics/stats_tracker.h"
 #include "starboard/file.h"
 

diff --git a/base/time/time_now_starboard.cc b/base/time/time_now_starboard.cc
@@ -19,7 +19,6 @@
 #include "base/time/time_override.h"
 #include "build/build_config.h"
 
-#include "starboard/common/log.h"
 #include "starboard/common/time.h"
 #include "starboard/types.h"
 

diff --git a/cobalt/base/localized_strings.cc b/cobalt/base/localized_strings.cc
@@ -21,7 +21,6 @@
 #include "base/logging.h"
 #include "base/optional.h"
 #include "starboard/common/file.h"
-#include "starboard/common/log.h"
 #include "starboard/system.h"
 #include "starboard/types.h"
 

diff --git a/cobalt/browser/memory_settings/calculations_test.cc b/cobalt/browser/memory_settings/calculations_test.cc
@@ -21,7 +21,6 @@
 #include "cobalt/browser/memory_settings/constants.h"
 #include "cobalt/browser/memory_settings/test_common.h"
 #include "cobalt/browser/switches.h"
-#include "starboard/common/log.h"
 #include "starboard/memory.h"
 #include "starboard/system.h"
 #include "testing/gtest/include/gtest/gtest.h"

diff --git a/cobalt/browser/memory_settings/pretty_print.cc b/cobalt/browser/memory_settings/pretty_print.cc
@@ -23,7 +23,6 @@
 #include "base/strings/string_split.h"
 #include "cobalt/browser/memory_settings/memory_settings.h"
 #include "cobalt/browser/memory_settings/table_printer.h"
-#include "starboard/common/log.h"
 #include "starboard/common/string.h"
 
 namespace cobalt {

diff --git a/cobalt/browser/memory_settings/pretty_print_test.cc b/cobalt/browser/memory_settings/pretty_print_test.cc
@@ -27,7 +27,6 @@
 #include "cobalt/browser/memory_settings/memory_settings.h"
 #include "cobalt/browser/memory_settings/test_common.h"
 #include "cobalt/browser/switches.h"
-#include "starboard/common/log.h"
 #include "starboard/memory.h"
 #include "starboard/string.h"
 #include "starboard/system.h"

diff --git a/cobalt/browser/memory_settings/table_printer.cc b/cobalt/browser/memory_settings/table_printer.cc
@@ -22,7 +22,6 @@
 #include <string>
 
 #include "base/logging.h"
-#include "starboard/common/log.h"
 
 namespace cobalt {
 namespace browser {

diff --git a/cobalt/browser/user_agent_platform_info.cc b/cobalt/browser/user_agent_platform_info.cc
@@ -25,7 +25,6 @@
 #include "cobalt/script/javascript_engine.h"
 #include "cobalt/version.h"
 #include "cobalt_build_id.h"  // NOLINT(build/include_subdir)
-#include "starboard/common/log.h"
 #include "starboard/common/string.h"
 #include "starboard/common/system_property.h"
 #include "starboard/extension/platform_info.h"

diff --git a/cobalt/browser/user_agent_string.cc b/cobalt/browser/user_agent_string.cc
@@ -23,7 +23,6 @@
 #include "base/command_line.h"
 #include "base/strings/stringprintf.h"
 #include "cobalt/browser/switches.h"
-#include "starboard/common/log.h"
 #include "starboard/common/string.h"
 #include "starboard/log.h"
 #include "starboard/system.h"

diff --git a/cobalt/browser/web_module.cc b/cobalt/browser/web_module.cc
@@ -80,7 +80,6 @@
 #include "cobalt/web/event.h"
 #include "cobalt/web/url.h"
 #include "starboard/accessibility.h"
-#include "starboard/common/log.h"
 #include "starboard/gles.h"
 
 #if defined(ENABLE_DEBUGGER)

diff --git a/cobalt/media/bidirectional_fit_reuse_allocator.cc b/cobalt/media/bidirectional_fit_reuse_allocator.cc
@@ -16,7 +16,7 @@
 
 #include <algorithm>
 
-#include "starboard/common/log.h"
+#include "base/logging.h"
 #include "starboard/common/pointer_arithmetic.h"
 #include "starboard/types.h"
 
@@ -38,7 +38,7 @@ BidirectionalFitReuseAllocator::FindFreeBlock(std::size_t size,
                                               FreeBlockSet::iterator begin,
                                               FreeBlockSet::iterator end,
                                               bool* allocate_from_front) {
-  SB_DCHECK(allocate_from_front);
+  DCHECK(allocate_from_front);
 
   *allocate_from_front = size > small_allocation_threshold_;
 

diff --git a/cobalt/media/file_data_source_test.cc b/cobalt/media/file_data_source_test.cc
@@ -19,14 +19,13 @@
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/test/task_environment.h"
-#include "starboard/common/log.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cobalt {
 namespace media {
 
 void OnReadFinished(int* bytes_read_out, int bytes_read_in) {
-  SB_CHECK(bytes_read_out);
+  CHECK(bytes_read_out);
   *bytes_read_out = bytes_read_in;
 }
 

diff --git a/cobalt/persistent_storage/persistent_settings.cc b/cobalt/persistent_storage/persistent_settings.cc
@@ -22,7 +22,6 @@
 #include "cobalt/base/task_runner_util.h"
 #include "components/prefs/json_pref_store.h"
 #include "starboard/common/file.h"
-#include "starboard/common/log.h"
 #include "starboard/configuration_constants.h"
 #include "starboard/system.h"
 

diff --git a/cobalt/persistent_storage/persistent_settings_test.cc b/cobalt/persistent_storage/persistent_settings_test.cc
@@ -20,7 +20,6 @@
 #include "base/test/task_environment.h"
 #include "base/values.h"
 #include "starboard/common/file.h"
-#include "starboard/common/log.h"
 #include "starboard/configuration_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

diff --git a/cobalt/renderer/egl_and_gles.h b/cobalt/renderer/egl_and_gles.h
@@ -16,7 +16,6 @@
 #define COBALT_RENDERER_EGL_AND_GLES_H_
 
 #include "base/logging.h"
-#include "starboard/common/log.h"
 #include "starboard/configuration.h"
 #include "starboard/egl.h"
 #include "starboard/gles.h"

diff --git a/cobalt/renderer/rasterizer/egl/draw_rect_linear_gradient.cc b/cobalt/renderer/rasterizer/egl/draw_rect_linear_gradient.cc
@@ -20,7 +20,6 @@
 #include "cobalt/renderer/backend/egl/utils.h"
 #include "cobalt/renderer/egl_and_gles.h"
 #include "egl/generated_shader_impl.h"
-#include "starboard/common/log.h"
 #include "starboard/configuration.h"
 #include "starboard/memory.h"
 

diff --git a/cobalt/speech/microphone_starboard.cc b/cobalt/speech/microphone_starboard.cc
@@ -14,8 +14,6 @@
 
 #include "cobalt/speech/microphone_starboard.h"
 
-#include "starboard/common/log.h"
-
 namespace cobalt {
 namespace speech {
 

diff --git a/cobalt/speech/url_fetcher_fake.cc b/cobalt/speech/url_fetcher_fake.cc
@@ -24,7 +24,6 @@
 #include "cobalt/network/custom/url_fetcher_response_writer.h"
 #include "cobalt/speech/google_streaming_api.pb.h"
 #include "net/base/io_buffer.h"
-#include "starboard/common/log.h"
 
 namespace cobalt {
 namespace speech {

diff --git a/cobalt/updater/crash_sandbox.cc b/cobalt/updater/crash_sandbox.cc
@@ -14,7 +14,6 @@
 
 // This is a test app for Evergreen that does nothing but crashes.
 
-#include "starboard/common/log.h"
 #include "starboard/event.h"
 
 void SbEventHandle(const SbEvent* event) {