| Index: chrome/browser/invalidation/ticl_invalidation_service_unittest.cc
|
| diff --git a/chrome/browser/invalidation/ticl_invalidation_service_unittest.cc b/chrome/browser/invalidation/ticl_invalidation_service_unittest.cc
|
| index 3a193bc8d0c97b3d56834f023536d9ddfc860b44..b5f1199e0f53706c32520d41a38aa297fe316362 100644
|
| --- a/chrome/browser/invalidation/ticl_invalidation_service_unittest.cc
|
| +++ b/chrome/browser/invalidation/ticl_invalidation_service_unittest.cc
|
| @@ -106,19 +106,13 @@ class TiclInvalidationServiceChannelTest : public ::testing::Test {
|
| };
|
|
|
| TEST_F(TiclInvalidationServiceChannelTest, ChannelSelectionTest) {
|
| - TiclInvalidationService::InvalidationNetworkChannel expected_gcm_channel =
|
| - TiclInvalidationService::GCM_NETWORK_CHANNEL;
|
| -#if defined(OS_IOS)
|
| - expected_gcm_channel = TiclInvalidationService::PUSH_CLIENT_CHANNEL;
|
| -#endif
|
| -
|
| EXPECT_EQ(TiclInvalidationService::PUSH_CLIENT_CHANNEL, GetNetworkChannel());
|
|
|
| // If stars allign use GCM channel.
|
| profile_->GetPrefs()->SetBoolean(prefs::kGCMChannelEnabled, true);
|
| profile_->GetPrefs()->SetBoolean(prefs::kInvalidationServiceUseGCMChannel,
|
| true);
|
| - EXPECT_EQ(expected_gcm_channel, GetNetworkChannel());
|
| + EXPECT_EQ(TiclInvalidationService::GCM_NETWORK_CHANNEL, GetNetworkChannel());
|
|
|
| // If Invalidation channel setting is not set or says false fall back to push
|
| // channel.
|
| @@ -147,7 +141,7 @@ TEST_F(TiclInvalidationServiceChannelTest, ChannelSelectionTest) {
|
| profile_->GetPrefs()->SetBoolean(prefs::kInvalidationServiceUseGCMChannel,
|
| true);
|
| profile_->GetPrefs()->SetBoolean(prefs::kGCMChannelEnabled, true);
|
| - EXPECT_EQ(expected_gcm_channel, GetNetworkChannel());
|
| + EXPECT_EQ(TiclInvalidationService::GCM_NETWORK_CHANNEL, GetNetworkChannel());
|
| }
|
|
|
| } // namespace invalidation
|
|
|