Internal change.

PiperOrigin-RevId: 423369197

cpp/platform/base/cancellation_flag_test.cc

@@ -17,6 +17,7 @@
 #include <memory>
 
 #include "gmock/gmock.h"
+#include "protobuf-matchers/protocol-buffer-matchers.h"
 #include "gtest/gtest.h"
 #include "platform/base/cancellation_flag_listener.h"
 #include "platform/base/feature_flags.h"

cpp/platform/base/error_code_recorder_test.cc

@@ -15,6 +15,7 @@
 #include "platform/base/error_code_recorder.h"
 
 #include "gmock/gmock.h"
+#include "protobuf-matchers/protocol-buffer-matchers.h"
 #include "gtest/gtest.h"
 
 namespace location {

cpp/platform/base/exception_test.cc

@@ -17,6 +17,7 @@
 #include <vector>
 
 #include "gmock/gmock.h"
+#include "protobuf-matchers/protocol-buffer-matchers.h"
 #include "gtest/gtest.h"
 #include "platform/base/exception_test.nc.h"
 

cpp/platform/impl/g3/crypto.cc

@@ -19,7 +19,7 @@
 
 #include "absl/strings/string_view.h"
 #include "platform/base/byte_array.h"
-#include "openssl/digest.h"
+#include "src/include/openssl/digest.h"
 
 namespace location {
 namespace nearby {

cpp/platform/impl/g3/log_message.h

@@ -34,7 +34,7 @@ class LogMessage : public api::LogMessage {
   std::ostream& Stream() override;
 
  private:
-  absl::LogStreamer log_streamer_;
+  google::LogMessage log_streamer_;
 };
 
 }  // namespace g3

cpp/platform/impl/g3/multi_thread_executor.h

@@ -20,7 +20,7 @@
 #include "absl/time/clock.h"
 #include "platform/api/submittable_executor.h"
 #include "platform/impl/shared/count_down_latch.h"
-#include "thread/threadpool.h"
+#include "nisaba/port/thread_pool.h"
 
 namespace location {
 namespace nearby {

cpp/platform/impl/g3/scheduled_executor.h

@@ -23,7 +23,7 @@
 #include "platform/api/scheduled_executor.h"
 #include "platform/base/runnable.h"
 #include "platform/impl/g3/single_thread_executor.h"
-#include "thread/threadpool.h"
+#include "nisaba/port/thread_pool.h"
 
 namespace location {
 namespace nearby {

cpp/platform/impl/ios/Source/Platform/log_message.h

@@ -36,7 +36,7 @@ class LogMessage : public api::LogMessage {
   std::ostream& Stream() override;
 
  private:
-  absl::LogStreamer log_streamer_;
+  google::LogMessage log_streamer_;
   api::LogMessage::Severity severity_;
 };
 

cpp/platform/impl/windows/crypto.cc

@@ -22,7 +22,7 @@
 #if defined NEARBY_WINDOWS_DLL
 #include "openssl/boringssl/src/include/openssl/digest.h"
 #else
-#include "openssl/digest.h"
+#include "src/include/openssl/digest.h"
 #endif
 
 // Function implementations for platform/api/crypto.h.

cpp/platform/impl/windows/log_message.h

@@ -34,7 +34,7 @@ class LogMessage : public api::LogMessage {
   std::ostream& Stream() override;
 
  private:
-  absl::LogStreamer log_streamer_;
+  google::LogMessage log_streamer_;
   static api::LogMessage::Severity min_log_severity_;
 };
 

cpp/platform/public/atomic_boolean_test.cc

@@ -15,6 +15,7 @@
 #include "platform/public/atomic_boolean.h"
 
 #include "gmock/gmock.h"
+#include "protobuf-matchers/protocol-buffer-matchers.h"
 #include "gtest/gtest.h"
 
 namespace location {

cpp/platform/public/ble_test.cc

@@ -17,6 +17,7 @@
 #include <memory>
 
 #include "gmock/gmock.h"
+#include "protobuf-matchers/protocol-buffer-matchers.h"
 #include "gtest/gtest.h"
 #include "platform/base/medium_environment.h"
 #include "platform/public/count_down_latch.h"

cpp/platform/public/bluetooth_adapter_test.cc

@@ -15,6 +15,7 @@
 #include "platform/public/bluetooth_adapter.h"
 
 #include "gmock/gmock.h"
+#include "protobuf-matchers/protocol-buffer-matchers.h"
 #include "gtest/gtest.h"
 #include "platform/base/bluetooth_utils.h"
 #include "platform/public/logging.h"

cpp/platform/public/bluetooth_classic_test.cc

@@ -17,6 +17,7 @@
 #include <memory>
 
 #include "gmock/gmock.h"
+#include "protobuf-matchers/protocol-buffer-matchers.h"
 #include "gtest/gtest.h"
 #include "absl/time/time.h"
 #include "platform/base/medium_environment.h"

cpp/platform/public/cancelable_alarm_test.cc

@@ -15,6 +15,7 @@
 #include "platform/public/cancelable_alarm.h"
 
 #include "gmock/gmock.h"
+#include "protobuf-matchers/protocol-buffer-matchers.h"
 #include "gtest/gtest.h"
 #include "absl/time/time.h"
 #include "platform/public/atomic_boolean.h"

cpp/platform/public/condition_variable_test.cc

@@ -15,6 +15,7 @@
 #include "platform/public/condition_variable.h"
 
 #include "gmock/gmock.h"
+#include "protobuf-matchers/protocol-buffer-matchers.h"
 #include "gtest/gtest.h"
 #include "absl/time/time.h"
 #include "platform/public/logging.h"

cpp/platform/public/crypto_test.cc

@@ -15,6 +15,7 @@
 #include "platform/public/crypto.h"
 
 #include "gmock/gmock.h"
+#include "protobuf-matchers/protocol-buffer-matchers.h"
 #include "gtest/gtest.h"
 #include "platform/base/byte_array.h"
 

cpp/platform/public/logging_test.cc

@@ -15,6 +15,7 @@
 #include "platform/public/logging.h"
 
 #include "gmock/gmock.h"
+#include "protobuf-matchers/protocol-buffer-matchers.h"
 #include "gtest/gtest.h"
 
 namespace {

cpp/platform/public/wifi_lan_test.cc

@@ -17,6 +17,7 @@
 #include <memory>
 
 #include "gmock/gmock.h"
+#include "protobuf-matchers/protocol-buffer-matchers.h"
 #include "gtest/gtest.h"
 #include "absl/strings/string_view.h"
 #include "platform/base/medium_environment.h"