diff --git a/base/files/file.cc b/base/files/file.cc index 9d3c38c77438..aa4e59563d78 100644 --- 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 diff --git a/base/files/file_starboard.cc b/base/files/file_starboard.cc index 1e1439be9887..86d5f21b2971 100644 --- 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 index 2339fd362f09..6c6fd1023c59 100644 --- 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 index ee99793be9e3..c07abb3911b1 100644 --- 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 index 502321e19352..f5e978455c6b 100644 --- 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 index 1f657e954e5a..d141817b0102 100644 --- 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 index ba28b4adb812..61630fa80de3 100644 --- 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 index 70276e511e99..fa5ebff0004f 100644 --- a/cobalt/browser/memory_settings/table_printer.cc +++ b/cobalt/browser/memory_settings/table_printer.cc @@ -22,7 +22,6 @@ #include #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 index 0284aa625a48..8b657e028b18 100644 --- 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 index 65bcf8413cc9..fa9455f9bd95 100644 --- 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 index 313a99047a1a..448aab92412b 100644 --- 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 index 8f505db230ea..cfb9a13775e8 100644 --- a/cobalt/media/bidirectional_fit_reuse_allocator.cc +++ b/cobalt/media/bidirectional_fit_reuse_allocator.cc @@ -16,7 +16,7 @@ #include -#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 index f387192dd773..4967df6f6a84 100644 --- 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 index ada6424385bb..1b24029c5622 100644 --- 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 index d653c9233f7e..a82f450f2347 100644 --- 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 index fdf1839138f3..345979fbe365 100644 --- 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 index d638f0e2cd48..ab50f8dff066 100644 --- 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 index 0f7350637f26..e9e5dee0622b 100644 --- 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 index 02f5e010bfc3..c35fd5f9b941 100644 --- 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 index 4ef31a2bc5ac..b21f07b94d1c 100644 --- 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) {