Commit 9c31a213 authored by Hiroki Sato's avatar Hiroki Sato Committed by Commit Bot

Replace CHROMEOS macro with OS_CHROMEOS

CHROMEOS macro is defined in third_party/webrtc.
This CL replaces it with more appropriate macro.

Bug: None
Change-Id: I440c0cf528ebb2c9ca3549a23e180026a2fc8a9c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2021787Reviewed-by: default avatarMikel Astiz <mastiz@chromium.org>
Auto-Submit: Hiroki Sato <hirokisato@chromium.org>
Commit-Queue: Hiroki Sato <hirokisato@chromium.org>
Cr-Commit-Position: refs/heads/master@{#735655}
parent 7c54d0fc
...@@ -767,11 +767,11 @@ IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest, ...@@ -767,11 +767,11 @@ IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest,
ASSERT_TRUE(SetupClients()) << "SetupClients() failed."; ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
ASSERT_EQ(1u, GetBookmarkBarNode(kSingleProfileIndex)->children().size()); ASSERT_EQ(1u, GetBookmarkBarNode(kSingleProfileIndex)->children().size());
#if defined(CHROMEOS) #if defined(OS_CHROMEOS)
// signin::SetRefreshTokenForPrimaryAccount() is needed on ChromeOS in order // signin::SetRefreshTokenForPrimaryAccount() is needed on ChromeOS in order
// to get a non-empty refresh token on startup. // to get a non-empty refresh token on startup.
GetClient(0)->SignInPrimaryAccount(); GetClient(0)->SignInPrimaryAccount();
#endif // defined(CHROMEOS) #endif // defined(OS_CHROMEOS)
ASSERT_TRUE(GetClient(kSingleProfileIndex)->AwaitEngineInitialization()); ASSERT_TRUE(GetClient(kSingleProfileIndex)->AwaitEngineInitialization());
// After restart, the last sync cycle snapshot should be empty. // After restart, the last sync cycle snapshot should be empty.
......
...@@ -223,11 +223,11 @@ IN_PROC_BROWSER_TEST_P(SingleClientPasswordsSyncTest, ...@@ -223,11 +223,11 @@ IN_PROC_BROWSER_TEST_P(SingleClientPasswordsSyncTest,
base::HistogramTester histogram_tester; base::HistogramTester histogram_tester;
ASSERT_TRUE(SetupClients()) << "SetupClients() failed."; ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
ASSERT_EQ(1, GetPasswordCount(0)); ASSERT_EQ(1, GetPasswordCount(0));
#if defined(CHROMEOS) #if defined(OS_CHROMEOS)
// signin::SetRefreshTokenForPrimaryAccount() is needed on ChromeOS in order // signin::SetRefreshTokenForPrimaryAccount() is needed on ChromeOS in order
// to get a non-empty refresh token on startup. // to get a non-empty refresh token on startup.
GetClient(0)->SignInPrimaryAccount(); GetClient(0)->SignInPrimaryAccount();
#endif // defined(CHROMEOS) #endif // defined(OS_CHROMEOS)
ASSERT_TRUE(GetClient(0)->AwaitEngineInitialization()); ASSERT_TRUE(GetClient(0)->AwaitEngineInitialization());
// After restart, the last sync cycle snapshot should be empty. Once a sync // After restart, the last sync cycle snapshot should be empty. Once a sync
...@@ -292,11 +292,11 @@ IN_PROC_BROWSER_TEST_F( ...@@ -292,11 +292,11 @@ IN_PROC_BROWSER_TEST_F(
base::HistogramTester histogram_tester; base::HistogramTester histogram_tester;
ASSERT_TRUE(SetupClients()) << "SetupClients() failed."; ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
ASSERT_EQ(2, GetPasswordCount(0)); ASSERT_EQ(2, GetPasswordCount(0));
#if defined(CHROMEOS) #if defined(OS_CHROMEOS)
// signin::SetRefreshTokenForPrimaryAccount() is needed on ChromeOS in order // signin::SetRefreshTokenForPrimaryAccount() is needed on ChromeOS in order
// to get a non-empty refresh token on startup. // to get a non-empty refresh token on startup.
GetClient(0)->SignInPrimaryAccount(); GetClient(0)->SignInPrimaryAccount();
#endif // defined(CHROMEOS) #endif // defined(OS_CHROMEOS)
ASSERT_TRUE(GetClient(0)->AwaitSyncSetupCompletion()); ASSERT_TRUE(GetClient(0)->AwaitSyncSetupCompletion());
ASSERT_EQ(2, GetPasswordCount(0)); ASSERT_EQ(2, GetPasswordCount(0));
......
...@@ -130,11 +130,11 @@ IN_PROC_BROWSER_TEST_F(SingleClientPollingSyncTest, ...@@ -130,11 +130,11 @@ IN_PROC_BROWSER_TEST_F(SingleClientPollingSyncTest,
IN_PROC_BROWSER_TEST_F(SingleClientPollingSyncTest, IN_PROC_BROWSER_TEST_F(SingleClientPollingSyncTest,
ShouldPollWhenIntervalExpiredAcrossRestarts) { ShouldPollWhenIntervalExpiredAcrossRestarts) {
ASSERT_TRUE(SetupClients()) << "SetupClients() failed."; ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
#if defined(CHROMEOS) #if defined(OS_CHROMEOS)
// signin::SetRefreshTokenForPrimaryAccount() is needed on ChromeOS in order // signin::SetRefreshTokenForPrimaryAccount() is needed on ChromeOS in order
// to get a non-empty refresh token on startup. // to get a non-empty refresh token on startup.
GetClient(0)->SignInPrimaryAccount(); GetClient(0)->SignInPrimaryAccount();
#endif // defined(CHROMEOS) #endif // defined(OS_CHROMEOS)
ASSERT_TRUE(GetClient(0)->AwaitEngineInitialization()); ASSERT_TRUE(GetClient(0)->AwaitEngineInitialization());
SyncPrefs remote_prefs(GetProfile(0)->GetPrefs()); SyncPrefs remote_prefs(GetProfile(0)->GetPrefs());
......
...@@ -166,11 +166,11 @@ IN_PROC_BROWSER_TEST_F(SingleClientPreferencesSyncTest, ...@@ -166,11 +166,11 @@ IN_PROC_BROWSER_TEST_F(SingleClientPreferencesSyncTest,
base::HistogramTester histogram_tester; base::HistogramTester histogram_tester;
ASSERT_TRUE(SetupClients()) << "SetupClients() failed."; ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
#if defined(CHROMEOS) #if defined(OS_CHROMEOS)
// signin::SetRefreshTokenForPrimaryAccount() is needed on ChromeOS in order // signin::SetRefreshTokenForPrimaryAccount() is needed on ChromeOS in order
// to get a non-empty refresh token on startup. // to get a non-empty refresh token on startup.
GetClient(0)->SignInPrimaryAccount(); GetClient(0)->SignInPrimaryAccount();
#endif // defined(CHROMEOS) #endif // defined(OS_CHROMEOS)
ASSERT_TRUE(GetClient(0)->AwaitEngineInitialization()); ASSERT_TRUE(GetClient(0)->AwaitEngineInitialization());
// After restart, the last sync cycle snapshot should be empty. // After restart, the last sync cycle snapshot should be empty.
......
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