remove rollback to xmpp when GCM disabled

chrome/browser/invalidation/ticl_profile_settings_provider_unittest.cc

Index: chrome/browser/invalidation/ticl_profile_settings_provider_unittest.cc
diff --git a/chrome/browser/invalidation/ticl_profile_settings_provider_unittest.cc b/chrome/browser/invalidation/ticl_profile_settings_provider_unittest.cc
index 7d62b4cdc0825f6b2773f2f99033478eded99cc5..2deed93a17289467396f91e0c59560c7189bde36 100644
--- a/chrome/browser/invalidation/ticl_profile_settings_provider_unittest.cc
+++ b/chrome/browser/invalidation/ticl_profile_settings_provider_unittest.cc
@@ -92,16 +92,16 @@ TEST_F(TiclProfileSettingsProviderTest, ChannelSelectionTest) {
   prefs->SetBoolean(prefs::kInvalidationServiceUseGCMChannel, true);
   EXPECT_EQ(TiclInvalidationService::GCM_NETWORK_CHANNEL, GetNetworkChannel());
 
+  // If invalidation channel setting says use GCM but GCM is not enabled, do not
+  // fall back to push channel.
+  prefs->SetBoolean(gcm::prefs::kGCMChannelStatus, false);
+  prefs->SetBoolean(prefs::kInvalidationServiceUseGCMChannel, true);
+  EXPECT_EQ(TiclInvalidationService::GCM_NETWORK_CHANNEL, GetNetworkChannel());
+
   // If invalidation channel setting is set to false, fall back to push channel.
   prefs->SetBoolean(gcm::prefs::kGCMChannelStatus, true);
   prefs->SetBoolean(prefs::kInvalidationServiceUseGCMChannel, false);
   EXPECT_EQ(TiclInvalidationService::PUSH_CLIENT_CHANNEL, GetNetworkChannel());
-
-  // If invalidation channel setting says use GCM but GCM is not enabled, fall
-  // back to push channel.
-  prefs->SetBoolean(gcm::prefs::kGCMChannelStatus, false);
-  prefs->SetBoolean(prefs::kInvalidationServiceUseGCMChannel, true);
-  EXPECT_EQ(TiclInvalidationService::PUSH_CLIENT_CHANNEL, GetNetworkChannel());
 }
 
 }  // namespace invalidation