From 9d4ad8a1d72631640d5e4d0161e7fcf6b1d4f21d Mon Sep 17 00:00:00 2001
From: suetfei <suetfei@google.com>
Date: Fri, 21 Jan 2022 10:10:01 -0800
Subject: [PATCH] Internal refactor.

PiperOrigin-RevId: 423349737
---
 cpp/core/internal/mediums/ble_v2/bloom_filter.cc     | 2 +-
 cpp/platform/base/logging.h                          | 6 +++++-
 cpp/platform/impl/g3/log_message.h                   | 2 +-
 cpp/platform/impl/ios/Source/Platform/log_message.h  | 2 +-
 cpp/platform/impl/ios/Source/Platform/log_message.mm | 2 +-
 cpp/platform/impl/windows/log_message.h              | 2 +-
 6 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/cpp/core/internal/mediums/ble_v2/bloom_filter.cc b/cpp/core/internal/mediums/ble_v2/bloom_filter.cc
index 90ecca3f..fb8e3210 100644
--- a/cpp/core/internal/mediums/ble_v2/bloom_filter.cc
+++ b/cpp/core/internal/mediums/ble_v2/bloom_filter.cc
@@ -16,7 +16,7 @@
 
 #include "absl/numeric/int128.h"
 #include "absl/strings/numbers.h"
-#include "smhasher/src/MurmurHash3.h"
+#include "src/MurmurHash3.h"
 
 namespace location {
 namespace nearby {
diff --git a/cpp/platform/base/logging.h b/cpp/platform/base/logging.h
index 70d988b9..0d06bbb6 100644
--- a/cpp/platform/base/logging.h
+++ b/cpp/platform/base/logging.h
@@ -16,8 +16,12 @@
 #define PLATFORM_BASE_LOGGING_H_
 
 // base/logging.h is only included to allow logging clients to include CHECK's.
-// In Chrome this will be translated to base/check.h. See crbug/1212611.
+// In Chrome this is base/check.h. See crbug/1212611.
+#ifdef NEARBY_CHROMIUM
 #include "base/check.h"
+#else
+#include "glog/logging.h"
+#endif
 #include "platform/api/log_message.h"
 #include "platform/api/platform.h"
 
diff --git a/cpp/platform/impl/g3/log_message.h b/cpp/platform/impl/g3/log_message.h
index 600f075f..63ecfd76 100644
--- a/cpp/platform/impl/g3/log_message.h
+++ b/cpp/platform/impl/g3/log_message.h
@@ -15,7 +15,7 @@
 #ifndef PLATFORM_IMPL_G3_LOG_MESSAGE_H_
 #define PLATFORM_IMPL_G3_LOG_MESSAGE_H_
 
-#include "base/check.h"
+#include "glog/logging.h"
 #include "platform/api/log_message.h"
 
 namespace location {
diff --git a/cpp/platform/impl/ios/Source/Platform/log_message.h b/cpp/platform/impl/ios/Source/Platform/log_message.h
index ce739c71..a3fbc032 100644
--- a/cpp/platform/impl/ios/Source/Platform/log_message.h
+++ b/cpp/platform/impl/ios/Source/Platform/log_message.h
@@ -15,7 +15,7 @@
 #ifndef PLATFORM_IMPL_IOS_LOG_MESSAGE_H_
 #define PLATFORM_IMPL_IOS_LOG_MESSAGE_H_
 
-#include "base/check.h"
+#include "glog/logging.h"
 #include "platform/api/log_message.h"
 
 namespace location {
diff --git a/cpp/platform/impl/ios/Source/Platform/log_message.mm b/cpp/platform/impl/ios/Source/Platform/log_message.mm
index 6a2f23e6..c502ed3e 100644
--- a/cpp/platform/impl/ios/Source/Platform/log_message.mm
+++ b/cpp/platform/impl/ios/Source/Platform/log_message.mm
@@ -14,7 +14,7 @@
 
 #include "platform/impl/ios/Source/Platform/log_message.h"
 
-#include "base/check.h"
+#include "glog/logging.h"
 #include "platform/api/log_message.h"
 #include "GoogleToolboxForMac/GTMLogger.h"
 
diff --git a/cpp/platform/impl/windows/log_message.h b/cpp/platform/impl/windows/log_message.h
index 62db6409..90d84bb8 100644
--- a/cpp/platform/impl/windows/log_message.h
+++ b/cpp/platform/impl/windows/log_message.h
@@ -15,7 +15,7 @@
 #ifndef PLATFORM_IMPL_WINDOWS_LOG_MESSAGE_H_
 #define PLATFORM_IMPL_WINDOWS_LOG_MESSAGE_H_
 
-#include "base/check.h"
+#include "glog/logging.h"
 #include "platform/api/log_message.h"
 
 namespace location {