[GCM] Cleanup for ios enabling

chrome/browser/invalidation/ticl_invalidation_service_unittest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/invalidation/ticl_invalidation_service.h"
 
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/invalidation/invalidation_service_factory.h"
 #include "chrome/browser/invalidation/invalidation_service_test_template.h"
 #include "chrome/browser/invalidation/profile_invalidation_auth_provider.h"
@@ skipping 90 matching lines @@
  protected:
   scoped_ptr<TestingProfile> profile_;
   SigninManagerBase* fake_signin_manager_;
   scoped_ptr<FakeProfileOAuth2TokenService> token_service_;
   scoped_ptr<TiclInvalidationService> invalidation_service_;
 };
 
 TEST_F(TiclInvalidationServiceChannelTest, ChannelSelectionTest) {
   TiclInvalidationService::InvalidationNetworkChannel expected_gcm_channel =
       TiclInvalidationService::GCM_NETWORK_CHANNEL;
-#if defined(OS_IOS)
-  expected_gcm_channel = TiclInvalidationService::PUSH_CLIENT_CHANNEL;

[pavely, 2014/03/26 17:10:53]

Could you replace references to expected_gcm_channel in this test with
GCM_NETWORK_CHANNEL?

[Nicolas Zea, 2014/03/26 17:47:03]

Done.

-#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());
 
   // If Invalidation channel setting is not set or says false fall back to push
   // channel.
@@ skipping 19 matching lines @@
 
   // If first invalidation setting gets enabled and after that gcm setting gets
   // enabled then should still switch to GCM channel.
   profile_->GetPrefs()->SetBoolean(prefs::kInvalidationServiceUseGCMChannel,
                                    true);
   profile_->GetPrefs()->SetBoolean(prefs::kGCMChannelEnabled, true);
   EXPECT_EQ(expected_gcm_channel, GetNetworkChannel());
 }
 
 }  // namespace invalidation