Rename util/logging.h to avoid collisions

Currently, the util/logging.h file causes build issues because other
external repos have the same file.

This patch fixes this bug by renaming our copy of logging.h to
osp_logging.h, the same way we renamed DCHECK to OSP_DCHECK.

Bug: b/155927492
Change-Id: I75ff546775bed01daeda2a631c06b4776e3829f1
Reviewed-on: https://chromium-review.googlesource.com/c/openscreen/+/2186351
Reviewed-by: mark a. foltz <mfoltz@chromium.org>

9 files changed, 9 insertions, 9 deletions

diff --git a/cast/sender/cast_app_availability_tracker.cc b/cast/sender/cast_app_availability_tracker.cc
index 6c21c799..0a018d19 100644
--- a/cast/sender/cast_app_availability_tracker.cc
+++ b/cast/sender/cast_app_availability_tracker.cc
@@ -4,7 +4,7 @@
 
 #include "cast/sender/cast_app_availability_tracker.h"
 
-#include "util/logging.h"
+#include "util/osp_logging.h"
 
 namespace openscreen {
 namespace cast {
diff --git a/cast/sender/cast_app_discovery_service_impl.cc b/cast/sender/cast_app_discovery_service_impl.cc
index 69028aac..955ab0e4 100644
--- a/cast/sender/cast_app_discovery_service_impl.cc
+++ b/cast/sender/cast_app_discovery_service_impl.cc
@@ -8,7 +8,7 @@
 #include <chrono>
 
 #include "cast/sender/public/cast_media_source.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
 
 namespace openscreen {
 namespace cast {
diff --git a/cast/sender/cast_app_discovery_service_impl_unittest.cc b/cast/sender/cast_app_discovery_service_impl_unittest.cc
index 008b1a74..9f2f8793 100644
--- a/cast/sender/cast_app_discovery_service_impl_unittest.cc
+++ b/cast/sender/cast_app_discovery_service_impl_unittest.cc
@@ -13,7 +13,7 @@
 #include "gtest/gtest.h"
 #include "platform/test/fake_clock.h"
 #include "platform/test/fake_task_runner.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
 
 namespace openscreen {
 namespace cast {
diff --git a/cast/sender/cast_platform_client.cc b/cast/sender/cast_platform_client.cc
index 41b657fd..4d59c65b 100644
--- a/cast/sender/cast_platform_client.cc
+++ b/cast/sender/cast_platform_client.cc
@@ -12,7 +12,7 @@
 #include "cast/common/public/cast_socket.h"
 #include "cast/common/public/service_info.h"
 #include "util/json/json_serialization.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
 #include "util/stringprintf.h"
 
 namespace openscreen {
diff --git a/cast/sender/channel/cast_auth_util.cc b/cast/sender/channel/cast_auth_util.cc
index fc103e9b..10cbdc45 100644
--- a/cast/sender/channel/cast_auth_util.cc
+++ b/cast/sender/channel/cast_auth_util.cc
@@ -14,7 +14,7 @@
 #include "cast/common/channel/proto/cast_channel.pb.h"
 #include "platform/api/time.h"
 #include "platform/base/error.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
 
 namespace openscreen {
 namespace cast {
diff --git a/cast/sender/channel/cast_auth_util_unittest.cc b/cast/sender/channel/cast_auth_util_unittest.cc
index 51e4e338..03655419 100644
--- a/cast/sender/channel/cast_auth_util_unittest.cc
+++ b/cast/sender/channel/cast_auth_util_unittest.cc
@@ -15,7 +15,7 @@
 #include "platform/api/time.h"
 #include "platform/test/paths.h"
 #include "testing/util/read_file.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
 
 namespace openscreen {
 namespace cast {
diff --git a/cast/sender/channel/sender_socket_factory.cc b/cast/sender/channel/sender_socket_factory.cc
index cf8d445c..a1f24ef0 100644
--- a/cast/sender/channel/sender_socket_factory.cc
+++ b/cast/sender/channel/sender_socket_factory.cc
@@ -9,7 +9,7 @@
 #include "cast/sender/channel/message_util.h"
 #include "platform/base/tls_connect_options.h"
 #include "util/crypto/certificate_utils.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
 
 using ::cast::channel::CastMessage;
 
diff --git a/cast/sender/public/cast_media_source.cc b/cast/sender/public/cast_media_source.cc
index ebc9a3fe..987d455d 100644
--- a/cast/sender/public/cast_media_source.cc
+++ b/cast/sender/public/cast_media_source.cc
@@ -6,7 +6,7 @@
 
 #include <algorithm>
 
-#include "util/logging.h"
+#include "util/osp_logging.h"
 
 namespace openscreen {
 namespace cast {
diff --git a/cast/sender/testing/test_helpers.cc b/cast/sender/testing/test_helpers.cc
index ff9a4575..a4b29fc2 100644
--- a/cast/sender/testing/test_helpers.cc
+++ b/cast/sender/testing/test_helpers.cc
@@ -10,7 +10,7 @@
 #include "gtest/gtest.h"
 #include "util/json/json_serialization.h"
 #include "util/json/json_value.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
 
 namespace openscreen {
 namespace cast {