Remove location namespace in third_party/nearby.

PiperOrigin-RevId: 500023196
This commit is contained in:
Suet-Fei Li
2023-01-06 02:53:57 -08:00
committed by Copybara-Service
parent 7afea00649
commit 084f7ebd88
714 changed files with 2710 additions and 3738 deletions
-2
View File
@@ -20,7 +20,6 @@
#include "absl/strings/string_view.h"
namespace location {
namespace nearby {
namespace api {
@@ -55,6 +54,5 @@ class DeviceInfo {
} // namespace api
} // namespace nearby
} // namespace location
#endif // THIRD_PARTY_NEARBY_FASTPAIR_INTERNAL_API_DEVICE_INFO_H_
@@ -23,7 +23,6 @@
#include "fastpair/internal/api/device_info.h"
#include "fastpair/internal/api/timer.h"
namespace location {
namespace nearby {
namespace api {
@@ -37,6 +36,5 @@ class ImplementationFastPairPlatform {
} // namespace api
} // namespace nearby
} // namespace location
#endif // THIRD_PARTY_NEARBY_FASTPAIR_INTERNAL_API_FAST_PAIR_PLATFORM_H_
-2
View File
@@ -17,7 +17,6 @@
#include <functional>
namespace location {
namespace nearby {
namespace api {
@@ -48,6 +47,5 @@ class Timer {
} // namespace api
} // namespace nearby
} // namespace location
#endif // LOCATION_NEARBY_CPP_FASTPAIR_INTERNAL_API_TIMER_H_
@@ -22,7 +22,6 @@
#include "absl/strings/str_format.h"
#include "absl/strings/string_view.h"
namespace location {
namespace nearby {
namespace fastpair {
namespace {
@@ -121,4 +120,3 @@ std::string CanonicalizeBluetoothAddress(uint64_t address) {
} // namespace fastpair
} // namespace nearby
} // namespace location
@@ -24,7 +24,6 @@
#include "absl/strings/string_view.h"
#include "absl/types/span.h"
namespace location {
namespace nearby {
namespace fastpair {
@@ -48,6 +47,5 @@ std::string CanonicalizeBluetoothAddress(uint64_t address);
} // namespace fastpair
} // namespace nearby
} // namespace location
#endif // THIRD_PARTY_NEARBY_FASTPAIR_INTERNAL_BASE_BLUETOOTH_ADDRESS_H_
@@ -20,7 +20,6 @@
#include "gtest/gtest.h"
#include "absl/types/span.h"
namespace location {
namespace nearby {
namespace fastpair {
namespace {
@@ -58,4 +57,3 @@ TEST(BluetoothUtil, CanonicalizeBluetoothAddress) {
} // namespace
} // namespace fastpair
} // namespace nearby
} // namespace location
-2
View File
@@ -20,7 +20,6 @@
#include "absl/container/flat_hash_set.h"
namespace location {
namespace nearby {
namespace fastpair {
@@ -57,6 +56,5 @@ class ObserverList {
} // namespace fastpair
} // namespace nearby
} // namespace location
#endif // THIRD_PARTY_NEARBY_FASTPAIR_INTERNAL_BASE_OBSERVER_LIST_H_
-2
View File
@@ -22,7 +22,6 @@
#include "internal/platform/logging.h"
#include "internal/platform/system_clock.h"
namespace location {
namespace nearby {
namespace fastpair {
@@ -205,4 +204,3 @@ bool Ble::IsScanningLocked() { return is_scanning_; }
} // namespace fastpair
} // namespace nearby
} // namespace location
-2
View File
@@ -27,7 +27,6 @@
#include "internal/platform/multi_thread_executor.h"
#include "internal/platform/mutex.h"
namespace location {
namespace nearby {
namespace fastpair {
@@ -125,6 +124,5 @@ class Ble {
} // namespace fastpair
} // namespace nearby
} // namespace location
#endif // THIRD_PARTY_NEARBY_FASTPAIR_INTERNAL_BLE_BLE_H_
-2
View File
@@ -21,7 +21,6 @@
#include "internal/platform/count_down_latch.h"
#include "internal/platform/medium_environment.h"
namespace location {
namespace nearby {
namespace fastpair {
namespace {
@@ -126,4 +125,3 @@ TEST_F(BleTest, CanStartDiscovery) {
} // namespace
} // namespace fastpair
} // namespace nearby
} // namespace location
-2
View File
@@ -23,7 +23,6 @@
#include "absl/strings/string_view.h"
#include "fastpair/internal/api/device_info.h"
namespace location {
namespace nearby {
namespace g3 {
@@ -53,6 +52,5 @@ class DeviceInfo : public api::DeviceInfo {
} // namespace g3
} // namespace nearby
} // namespace location
#endif // THIRD_PARTY_NEARBY_FASTPAIR_INTERNAL_IMPL_G3_DEVICE_INFO_H_
@@ -21,7 +21,6 @@
#include "absl/synchronization/notification.h"
#include "fastpair/internal/api/device_info.h"
namespace location {
namespace nearby {
namespace g3 {
namespace {
@@ -73,4 +72,3 @@ TEST(DeviceInfo, UnregisterScreenLockedListener) {
} // namespace
} // namespace g3
} // namespace nearby
} // namespace location
@@ -19,7 +19,6 @@
#include "fastpair/internal/impl/g3/device_info.h"
#include "fastpair/internal/impl/g3/timer.h"
namespace location {
namespace nearby {
namespace api {
@@ -34,4 +33,3 @@ std::unique_ptr<api::Timer> ImplementationFastPairPlatform::CreateTimer() {
} // namespace api
} // namespace nearby
} // namespace location
-2
View File
@@ -20,7 +20,6 @@
#include "fastpair/internal/api/timer.h"
namespace location {
namespace nearby {
namespace g3 {
@@ -68,6 +67,5 @@ class Timer : public api::Timer {
} // namespace g3
} // namespace nearby
} // namespace location
#endif // THIRD_PARTY_NEARBY_FASTPAIR_INTERNAL_IMPL_G3_TIMER_H_
@@ -37,7 +37,6 @@
#include "winrt/Windows.Storage.Streams.h"
#include "winrt/base.h"
namespace location {
namespace nearby {
namespace windows {
@@ -372,4 +371,3 @@ void BleGattClient::OnValueChanged(GattCharacteristic const& characteristic,
} // namespace windows
} // namespace nearby
} // namespace location
@@ -28,7 +28,6 @@
#include "winrt/Windows.Devices.Bluetooth.GenericAttributeProfile.h"
#include "winrt/Windows.Devices.Bluetooth.h"
namespace location {
namespace nearby {
namespace windows {
@@ -133,6 +132,5 @@ class BleGattClient {
} // namespace windows
} // namespace nearby
} // namespace location
#endif // THIRD_PARTY_NEARBY_FASTPAIR_INTERNAL_IMPL_WINDOWS_BLE_GATT_CLIENT_H_
@@ -31,7 +31,6 @@
#include "winrt/Windows.Foundation.h"
#include "winrt/Windows.System.h"
namespace location {
namespace nearby {
namespace windows {
@@ -199,4 +198,3 @@ void DeviceInfo::UnregisterScreenLockedListener(
} // namespace windows
} // namespace nearby
} // namespace location
+1 -2
View File
@@ -25,7 +25,6 @@
#include "absl/strings/string_view.h"
#include "fastpair/internal/api/device_info.h"
namespace location {
namespace nearby {
namespace windows {
@@ -51,5 +50,5 @@ class DeviceInfo : public api::DeviceInfo {
} // namespace windows
} // namespace nearby
} // namespace location
#endif // THIRD_PARTY_NEARBY_FASTPAIR_INTERNAL_IMPL_WINDOWS_DEVICE_INFO_H_
@@ -21,7 +21,6 @@
#include "absl/synchronization/notification.h"
#include "fastpair/internal/api/device_info.h"
namespace location {
namespace nearby {
namespace windows {
namespace {
@@ -92,4 +91,3 @@ TEST(DeviceInfo, DISABLED_UpdateScreenLockedListener) {
} // namespace
} // namespace windows
} // namespace nearby
} // namespace location
@@ -22,7 +22,6 @@
#include "fastpair/internal/impl/windows/device_info.h"
#include "fastpair/internal/impl/windows/timer.h"
namespace location {
namespace nearby {
namespace api {
@@ -37,4 +36,3 @@ std::unique_ptr<api::Timer> ImplementationFastPairPlatform::CreateTimer() {
} // namespace api
} // namespace nearby
} // namespace location
-2
View File
@@ -20,7 +20,6 @@
#include "internal/platform/logging.h"
namespace location {
namespace nearby {
namespace windows {
@@ -111,4 +110,3 @@ void CALLBACK Timer::TimerRoutine(PVOID lpParam, BOOLEAN TimerOrWaitFired) {
} // namespace windows
} // namespace nearby
} // namespace location
-2
View File
@@ -21,7 +21,6 @@
#include "fastpair/internal/api/timer.h"
namespace location {
namespace nearby {
namespace windows {
@@ -46,6 +45,5 @@ class Timer : public api::Timer {
} // namespace windows
} // namespace nearby
} // namespace location
#endif // THIRD_PARTY_NEARBY_FASTPAIR_INTERNAL_IMPL_WINDOWS_TIMER_H_
@@ -20,7 +20,6 @@
#include "gtest/gtest.h"
#include "fastpair/internal/api/fast_pair_platform.h"
namespace location {
namespace nearby {
namespace windows {
namespace {
@@ -66,4 +65,3 @@ TEST(Timer, DISABLED_TestFireNow) {
} // namespace
} // namespace windows
} // namespace nearby
} // namespace location
+2 -4
View File
@@ -26,7 +26,6 @@
#include "internal/platform/bluetooth_utils.h"
#include "internal/platform/byte_array.h"
namespace location {
namespace nearby {
namespace windows {
@@ -41,8 +40,8 @@ std::string uint64_to_mac_address_string(uint64_t bluetoothAddress) {
}
uint64_t mac_address_string_to_uint64(absl::string_view mac_address) {
location::nearby::ByteArray mac_address_array =
location::nearby::BluetoothUtils::FromString(mac_address);
nearby::ByteArray mac_address_array =
nearby::BluetoothUtils::FromString(mac_address);
uint64_t mac_address_uint64 = 0;
for (int i = 0; i < mac_address_array.size(); i++) {
mac_address_uint64 <<= 8;
@@ -54,4 +53,3 @@ uint64_t mac_address_string_to_uint64(absl::string_view mac_address) {
} // namespace windows
} // namespace nearby
} // namespace location
-2
View File
@@ -25,7 +25,6 @@
#include "winrt/Windows.Foundation.h"
#include "winrt/base.h"
namespace location {
namespace nearby {
namespace windows {
@@ -34,6 +33,5 @@ uint64_t mac_address_string_to_uint64(absl::string_view mac_address);
} // namespace windows
} // namespace nearby
} // namespace location
#endif // THIRD_PARTY_NEARBY_FASTPAIR_INTERNAL_IMPL_WINDOWS_UTILS_H_
-2
View File
@@ -22,7 +22,6 @@
#include "fastpair/internal/api/device_info.h"
#include "fastpair/internal/api/fast_pair_platform.h"
namespace location {
namespace nearby {
namespace fastpair {
@@ -42,6 +41,5 @@ class DeviceInfo {
} // namespace fastpair
} // namespace nearby
} // namespace location
#endif // THIRD_PARTY_NEARBY_FASTPAIR_INTERNAL_PUBLIC_DEVICE_INFO_H_
@@ -17,7 +17,6 @@
#include <functional>
#include <string>
namespace location {
namespace nearby {
namespace fastpair {
@@ -42,4 +41,3 @@ void DeviceInfoImpl::UnregisterScreenLockedListener(
} // namespace fastpair
} // namespace nearby
} // namespace location
@@ -22,7 +22,6 @@
#include "fastpair/internal/api/fast_pair_platform.h"
#include "fastpair/internal/public/device_info.h"
namespace location {
namespace nearby {
namespace fastpair {
@@ -46,6 +45,5 @@ class DeviceInfoImpl : public DeviceInfo {
} // namespace fastpair
} // namespace nearby
} // namespace location
#endif // THIRD_PARTY_NEARBY_FASTPAIR_INTERNAL_PUBLIC_DEVICE_INFO_IMPL_H_
-2
View File
@@ -19,7 +19,6 @@
#include "absl/time/time.h"
namespace location {
namespace nearby {
namespace fastpair {
@@ -43,6 +42,5 @@ class TaskRunner {
} // namespace fastpair
} // namespace nearby
} // namespace location
#endif // THIRD_PARTY_NEARBY_FASTPAIR_INTERNAL_PUBLIC_TASK_RUNNER_H_
+1 -4
View File
@@ -23,13 +23,11 @@
#include "absl/random/random.h"
#include "fastpair/internal/public/timer_impl.h"
namespace location {
namespace nearby {
namespace fastpair {
TaskRunnerImpl::TaskRunnerImpl(uint32_t runner_count) {
executor_ =
std::make_unique<::location::nearby::MultiThreadExecutor>(runner_count);
executor_ = std::make_unique<::nearby::MultiThreadExecutor>(runner_count);
}
TaskRunnerImpl::~TaskRunnerImpl() = default;
@@ -79,4 +77,3 @@ uint64_t TaskRunnerImpl::GenerateId() {
} // namespace fastpair
} // namespace nearby
} // namespace location
+1 -3
View File
@@ -26,7 +26,6 @@
#include "fastpair/internal/public/timer.h"
#include "internal/platform/multi_thread_executor.h"
namespace location {
namespace nearby {
namespace fastpair {
@@ -44,13 +43,12 @@ class TaskRunnerImpl : public TaskRunner {
uint64_t GenerateId();
mutable absl::Mutex mutex_;
std::unique_ptr<::location::nearby::MultiThreadExecutor> executor_;
std::unique_ptr<::nearby::MultiThreadExecutor> executor_;
absl::flat_hash_map<uint64_t, std::unique_ptr<Timer>> timers_map_
ABSL_GUARDED_BY(mutex_);
};
} // namespace fastpair
} // namespace nearby
} // namespace location
#endif // THIRD_PARTY_NEARBY_FASTPAIR_INTERNAL_PUBLIC_TASK_RUNNER_IMPL_H_
@@ -22,7 +22,6 @@
#include "absl/synchronization/notification.h"
#include "absl/time/clock.h"
namespace location {
namespace nearby {
namespace fastpair {
namespace {
@@ -163,4 +162,3 @@ TEST(TaskRunnerImpl, PostEmptyTask) {
} // namespace
} // namespace fastpair
} // namespace nearby
} // namespace location
-2
View File
@@ -17,7 +17,6 @@
#include <functional>
namespace location {
namespace nearby {
namespace fastpair {
@@ -46,6 +45,5 @@ class Timer {
} // namespace fastpair
} // namespace nearby
} // namespace location
#endif // THIRD_PARTY_NEARBY_FASTPAIR_INTERNAL_PUBLIC_TIMER_H_
-2
View File
@@ -20,7 +20,6 @@
#include "absl/time/clock.h"
#include "internal/platform/logging.h"
namespace location {
namespace nearby {
namespace fastpair {
@@ -65,4 +64,3 @@ bool TimerImpl::FireNow() {
} // namespace fastpair
} // namespace nearby
} // namespace location
-2
View File
@@ -21,7 +21,6 @@
#include "fastpair/internal/api/fast_pair_platform.h"
#include "fastpair/internal/public/timer.h"
namespace location {
namespace nearby {
namespace fastpair {
@@ -43,6 +42,5 @@ class TimerImpl : public Timer {
} // namespace fastpair
} // namespace nearby
} // namespace location
#endif // THIRD_PARTY_NEARBY_FASTPAIR_INTERNAL_PUBLIC_TIMER_IMPL_H_
@@ -16,7 +16,6 @@
#include "gtest/gtest.h"
namespace location {
namespace nearby {
namespace fastpair {
namespace {
@@ -59,4 +58,3 @@ TEST(TimerImpl, TestFireNow) {
} // namespace
} // namespace fastpair
} // namespace nearby
} // namespace location
@@ -23,7 +23,6 @@
#include "internal/network/http_client.h"
namespace location {
namespace nearby {
namespace network {
@@ -146,6 +145,5 @@ class FastPairFakeHttpClient : public HttpClient {
} // namespace network
} // namespace nearby
} // namespace location
#endif // THIRD_PARTY_NEARBY_FASTPAIR_INTERNAL_TEST_FAST_PAIR_FAKE_HTTP_CLIENT_H_
@@ -29,7 +29,6 @@
#include "absl/status/statusor.h"
#include "absl/strings/string_view.h"
namespace location {
namespace nearby {
namespace network {
namespace {
@@ -147,4 +146,3 @@ TEST_F(FastPairFakeHttpClientTest, TestCompleteNotExistingRequest) {
} // namespace
} // namespace network
} // namespace nearby
} // namespace location