Commit 6b3f31c5 authored by Michael Hansen's avatar Michael Hansen Committed by Commit Bot

Fix Chrome OS macro in FastInitiationManager.

Replaces instances of "CHROME_OS" with "OS_CHROMEOS" in macros in
FastInitiationManager.

Original umbrella issue: crbug.com/1099858

Bug: 1119969
Change-Id: Ia0c1334f607cfd583a4c8c327dab196fd73ba808
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2369736Reviewed-by: default avatarRyan Hansberry <hansberry@chromium.org>
Commit-Queue: Ryan Hansberry <hansberry@chromium.org>
Cr-Commit-Position: refs/heads/master@{#801072}
parent 38f45b92
...@@ -21,7 +21,7 @@ enum class FastInitVersion : uint8_t { ...@@ -21,7 +21,7 @@ enum class FastInitVersion : uint8_t {
kV1 = 0, kV1 = 0,
}; };
#if defined(CHROME_OS) #if defined(OS_CHROMEOS)
constexpr base::TimeDelta kMinFastInitAdvertisingInterval = constexpr base::TimeDelta kMinFastInitAdvertisingInterval =
base::TimeDelta::FromMilliseconds(100); base::TimeDelta::FromMilliseconds(100);
constexpr base::TimeDelta kMaxFastInitAdvertisingInterval = constexpr base::TimeDelta kMaxFastInitAdvertisingInterval =
...@@ -94,7 +94,7 @@ void FastInitiationManager::StartAdvertising( ...@@ -94,7 +94,7 @@ void FastInitiationManager::StartAdvertising(
start_callback_ = std::move(callback); start_callback_ = std::move(callback);
start_error_callback_ = std::move(error_callback); start_error_callback_ = std::move(error_callback);
#if defined(CHROME_OS) #if defined(OS_CHROMEOS)
adapter_->SetAdvertisingInterval( adapter_->SetAdvertisingInterval(
kMinFastInitAdvertisingInterval, kMaxFastInitAdvertisingInterval, kMinFastInitAdvertisingInterval, kMaxFastInitAdvertisingInterval,
base::BindOnce(&FastInitiationManager::OnSetAdvertisingInterval, base::BindOnce(&FastInitiationManager::OnSetAdvertisingInterval,
...@@ -116,7 +116,7 @@ void FastInitiationManager::StopAdvertising( ...@@ -116,7 +116,7 @@ void FastInitiationManager::StopAdvertising(
return; return;
} }
#if defined(CHROME_OS) #if defined(OS_CHROMEOS)
adapter_->SetAdvertisingInterval( adapter_->SetAdvertisingInterval(
kMinDefaultAdvertisingInterval, kMaxDefaultAdvertisingInterval, kMinDefaultAdvertisingInterval, kMaxDefaultAdvertisingInterval,
base::BindOnce(&FastInitiationManager::OnRestoreAdvertisingInterval, base::BindOnce(&FastInitiationManager::OnRestoreAdvertisingInterval,
......
...@@ -26,7 +26,7 @@ constexpr const char kNearbySharingFastInitiationServiceUuid[] = ...@@ -26,7 +26,7 @@ constexpr const char kNearbySharingFastInitiationServiceUuid[] =
"0000fe2c-0000-1000-8000-00805f9b34fb"; "0000fe2c-0000-1000-8000-00805f9b34fb";
const uint8_t kNearbySharingFastPairId[] = {0xfc, 0x12, 0x8e}; const uint8_t kNearbySharingFastPairId[] = {0xfc, 0x12, 0x8e};
#if defined(CHROME_OS) #if defined(OS_CHROMEOS)
const int64_t kFastInitAdvertisingInterval = 100; const int64_t kFastInitAdvertisingInterval = 100;
const int64_t kDefaultAdvertisingInterval = 0; const int64_t kDefaultAdvertisingInterval = 0;
#endif #endif
...@@ -65,7 +65,7 @@ class MockBluetoothAdapterWithAdvertisements ...@@ -65,7 +65,7 @@ class MockBluetoothAdapterWithAdvertisements
void(RegisterAdvertisementArgs*)); void(RegisterAdvertisementArgs*));
MOCK_METHOD2(OnSetAdvertisingInterval, void(int64_t, int64_t)); MOCK_METHOD2(OnSetAdvertisingInterval, void(int64_t, int64_t));
#if defined(CHROME_OS) #if defined(OS_CHROMEOS)
void SetAdvertisingInterval( void SetAdvertisingInterval(
const base::TimeDelta& min, const base::TimeDelta& min,
const base::TimeDelta& max, const base::TimeDelta& max,
...@@ -230,7 +230,7 @@ TEST_F(NearbySharingFastInitiationManagerTest, ...@@ -230,7 +230,7 @@ TEST_F(NearbySharingFastInitiationManagerTest,
EXPECT_FALSE(called_on_start_advertising_error()); EXPECT_FALSE(called_on_start_advertising_error());
EXPECT_FALSE(called_on_stop_advertising()); EXPECT_FALSE(called_on_stop_advertising());
EXPECT_TRUE(fake_advertisement->HasObserver(fast_initiation_manager_.get())); EXPECT_TRUE(fake_advertisement->HasObserver(fast_initiation_manager_.get()));
#if defined(CHROME_OS) #if defined(OS_CHROMEOS)
EXPECT_EQ(1u, set_advertising_interval_call_count()); EXPECT_EQ(1u, set_advertising_interval_call_count());
EXPECT_EQ(kFastInitAdvertisingInterval, last_advertising_interval_min()); EXPECT_EQ(kFastInitAdvertisingInterval, last_advertising_interval_min());
EXPECT_EQ(kFastInitAdvertisingInterval, last_advertising_interval_max()); EXPECT_EQ(kFastInitAdvertisingInterval, last_advertising_interval_max());
...@@ -247,7 +247,7 @@ TEST_F(NearbySharingFastInitiationManagerTest, ...@@ -247,7 +247,7 @@ TEST_F(NearbySharingFastInitiationManagerTest,
EXPECT_FALSE(called_on_start_advertising_error()); EXPECT_FALSE(called_on_start_advertising_error());
EXPECT_FALSE(called_on_stop_advertising()); EXPECT_FALSE(called_on_stop_advertising());
EXPECT_TRUE(fake_advertisement->HasObserver(fast_initiation_manager_.get())); EXPECT_TRUE(fake_advertisement->HasObserver(fast_initiation_manager_.get()));
#if defined(CHROME_OS) #if defined(OS_CHROMEOS)
EXPECT_EQ(1u, set_advertising_interval_call_count()); EXPECT_EQ(1u, set_advertising_interval_call_count());
EXPECT_EQ(kFastInitAdvertisingInterval, last_advertising_interval_min()); EXPECT_EQ(kFastInitAdvertisingInterval, last_advertising_interval_min());
EXPECT_EQ(kFastInitAdvertisingInterval, last_advertising_interval_max()); EXPECT_EQ(kFastInitAdvertisingInterval, last_advertising_interval_max());
...@@ -263,7 +263,7 @@ TEST_F(NearbySharingFastInitiationManagerTest, TestStartAdvertising_Error) { ...@@ -263,7 +263,7 @@ TEST_F(NearbySharingFastInitiationManagerTest, TestStartAdvertising_Error) {
EXPECT_FALSE(called_on_start_advertising()); EXPECT_FALSE(called_on_start_advertising());
EXPECT_TRUE(called_on_start_advertising_error()); EXPECT_TRUE(called_on_start_advertising_error());
EXPECT_FALSE(called_on_stop_advertising()); EXPECT_FALSE(called_on_stop_advertising());
#if defined(CHROME_OS) #if defined(OS_CHROMEOS)
EXPECT_EQ(1u, set_advertising_interval_call_count()); EXPECT_EQ(1u, set_advertising_interval_call_count());
EXPECT_EQ(kFastInitAdvertisingInterval, last_advertising_interval_min()); EXPECT_EQ(kFastInitAdvertisingInterval, last_advertising_interval_min());
EXPECT_EQ(kFastInitAdvertisingInterval, last_advertising_interval_max()); EXPECT_EQ(kFastInitAdvertisingInterval, last_advertising_interval_max());
...@@ -289,7 +289,7 @@ TEST_F(NearbySharingFastInitiationManagerTest, TestStopAdvertising) { ...@@ -289,7 +289,7 @@ TEST_F(NearbySharingFastInitiationManagerTest, TestStopAdvertising) {
auto fake_advertisement = base::MakeRefCounted<FakeBluetoothAdvertisement>(); auto fake_advertisement = base::MakeRefCounted<FakeBluetoothAdvertisement>();
std::move(register_args_->callback).Run(fake_advertisement); std::move(register_args_->callback).Run(fake_advertisement);
#if defined(CHROME_OS) #if defined(OS_CHROMEOS)
EXPECT_EQ(1u, set_advertising_interval_call_count()); EXPECT_EQ(1u, set_advertising_interval_call_count());
EXPECT_EQ(kFastInitAdvertisingInterval, last_advertising_interval_min()); EXPECT_EQ(kFastInitAdvertisingInterval, last_advertising_interval_min());
EXPECT_EQ(kFastInitAdvertisingInterval, last_advertising_interval_max()); EXPECT_EQ(kFastInitAdvertisingInterval, last_advertising_interval_max());
...@@ -300,7 +300,7 @@ TEST_F(NearbySharingFastInitiationManagerTest, TestStopAdvertising) { ...@@ -300,7 +300,7 @@ TEST_F(NearbySharingFastInitiationManagerTest, TestStopAdvertising) {
EXPECT_TRUE(called_on_start_advertising()); EXPECT_TRUE(called_on_start_advertising());
EXPECT_FALSE(called_on_start_advertising_error()); EXPECT_FALSE(called_on_start_advertising_error());
EXPECT_TRUE(called_on_stop_advertising()); EXPECT_TRUE(called_on_stop_advertising());
#if defined(CHROME_OS) #if defined(OS_CHROMEOS)
EXPECT_EQ(2u, set_advertising_interval_call_count()); EXPECT_EQ(2u, set_advertising_interval_call_count());
EXPECT_EQ(kDefaultAdvertisingInterval, last_advertising_interval_min()); EXPECT_EQ(kDefaultAdvertisingInterval, last_advertising_interval_min());
EXPECT_EQ(kDefaultAdvertisingInterval, last_advertising_interval_max()); EXPECT_EQ(kDefaultAdvertisingInterval, last_advertising_interval_max());
...@@ -320,7 +320,7 @@ TEST_F(NearbySharingFastInitiationManagerTest, TestAdvertisementReleased) { ...@@ -320,7 +320,7 @@ TEST_F(NearbySharingFastInitiationManagerTest, TestAdvertisementReleased) {
EXPECT_FALSE(called_on_start_advertising_error()); EXPECT_FALSE(called_on_start_advertising_error());
EXPECT_FALSE(called_on_stop_advertising()); EXPECT_FALSE(called_on_stop_advertising());
EXPECT_FALSE(fake_advertisement->HasObserver(fast_initiation_manager_.get())); EXPECT_FALSE(fake_advertisement->HasObserver(fast_initiation_manager_.get()));
#if defined(CHROME_OS) #if defined(OS_CHROMEOS)
EXPECT_EQ(2u, set_advertising_interval_call_count()); EXPECT_EQ(2u, set_advertising_interval_call_count());
EXPECT_EQ(kDefaultAdvertisingInterval, last_advertising_interval_min()); EXPECT_EQ(kDefaultAdvertisingInterval, last_advertising_interval_min());
EXPECT_EQ(kDefaultAdvertisingInterval, last_advertising_interval_max()); EXPECT_EQ(kDefaultAdvertisingInterval, last_advertising_interval_max());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment