[GCM] Cleanup for ios enabling

[GCM] Cleanup for ios enabling

BUG=342317
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=260313

[Nicolas Zea, 2014-03-26 00:54:30]

+Pavel for invalidations
+Jian Li for gcm

[jianli, 2014-03-26 01:00:08]

gcm lgtm

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

lgtm with one comment.

https://codereview.chromium.org/211973003/diff/30001/chrome/browser/invalidat...
File chrome/browser/invalidation/ticl_invalidation_service_unittest.cc (left):

https://codereview.chromium.org/211973003/diff/30001/chrome/browser/invalidat...
chrome/browser/invalidation/ticl_invalidation_service_unittest.cc:112:
expected_gcm_channel = TiclInvalidationService::PUSH_CLIENT_CHANNEL;
Could you replace references to expected_gcm_channel in this test with
GCM_NETWORK_CHANNEL?

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

Done, committing.

https://codereview.chromium.org/211973003/diff/30001/chrome/browser/invalidat...
File chrome/browser/invalidation/ticl_invalidation_service_unittest.cc (left):

https://codereview.chromium.org/211973003/diff/30001/chrome/browser/invalidat...
chrome/browser/invalidation/ticl_invalidation_service_unittest.cc:112:
expected_gcm_channel = TiclInvalidationService::PUSH_CLIENT_CHANNEL;
On 2014/03/26 17:10:53, pavely wrote:
> Could you replace references to expected_gcm_channel in this test with
> GCM_NETWORK_CHANNEL?

Done.

[Nicolas Zea, 2014-03-26 17:47:28]

The CQ bit was checked by zea@chromium.org

[commit-bot: I haz the power, 2014-03-26 17:48:12]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/zea@chromium.org/211973003/70001

[commit-bot: I haz the power, 2014-03-26 17:48:28]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-26 17:48:29]

Failed to apply patch for
chrome/browser/invalidation/ticl_invalidation_service.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/browser/invalidation/ticl_invalidation_service.cc
  Hunk #1 FAILED at 428.
  1 out of 1 hunk FAILED -- saving rejects to file
chrome/browser/invalidation/ticl_invalidation_service.cc.rej

Patch:       chrome/browser/invalidation/ticl_invalidation_service.cc
Index: chrome/browser/invalidation/ticl_invalidation_service.cc
diff --git a/chrome/browser/invalidation/ticl_invalidation_service.cc
b/chrome/browser/invalidation/ticl_invalidation_service.cc
index
28c9c9d0dd49b0e7e41723ffaa25279567a39f7f..5d91d7d79a3856a0f6280fdfc956d71d3b7c56b5
100644
--- a/chrome/browser/invalidation/ticl_invalidation_service.cc
+++ b/chrome/browser/invalidation/ticl_invalidation_service.cc
@@ -428,15 +428,12 @@ void TiclInvalidationService::StartInvalidator(
 
 void TiclInvalidationService::UpdateInvalidationNetworkChannel() {
   InvalidationNetworkChannel network_channel_type = PUSH_CLIENT_CHANNEL;
-// For now don't use GCM on iOS.
-#if !defined(OS_IOS)
   if (profile_->GetPrefs()->GetBoolean(
           prefs::kInvalidationServiceUseGCMChannel) &&
       gcm::GCMProfileService::GetGCMEnabledState(profile_) ==
           gcm::GCMProfileService::ALWAYS_ENABLED) {
     network_channel_type = GCM_NETWORK_CHANNEL;
   }
-#endif
   if (network_channel_type_ == network_channel_type)
     return;
   network_channel_type_ = network_channel_type;

[Nicolas Zea, 2014-03-27 18:37:59]

The CQ bit was checked by zea@chromium.org

[Nicolas Zea, 2014-03-27 18:38:23]

The CQ bit was unchecked by zea@chromium.org

[Nicolas Zea, 2014-03-27 18:39:29]

The CQ bit was checked by zea@chromium.org

[commit-bot: I haz the power, 2014-03-27 18:40:50]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/zea@chromium.org/211973003/100001

[commit-bot: I haz the power, 2014-03-27 19:20:16]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-27 19:20:17]

Retried try job too often on chromium_presubmit for step(s) presubmit
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=chromium_p...

[Nicolas Zea, 2014-03-27 19:46:18]

+Richard for invalidations

[rlarocque, 2014-03-27 20:01:53]

lgtm

[Nicolas Zea, 2014-03-27 20:05:02]

The CQ bit was checked by zea@chromium.org

[commit-bot: I haz the power, 2014-03-27 20:07:17]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/zea@chromium.org/211973003/100001

[commit-bot: I haz the power, 2014-03-28 02:29:42]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-28 02:29:42]

Retried try job too often on win_rel for step(s) content_browsertests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_rel&nu...

[Nicolas Zea, 2014-03-28 02:30:11]

The CQ bit was checked by zea@chromium.org

[commit-bot: I haz the power, 2014-03-28 02:31:54]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/zea@chromium.org/211973003/100001

[commit-bot: I haz the power, 2014-03-28 02:53:55]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-28 02:53:55]

Retried try job too often on ios_dbg_simulator for step(s) url_unittests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=ios_dbg_si...

[Nicolas Zea, 2014-03-28 20:42:36]

The CQ bit was checked by zea@chromium.org

[commit-bot: I haz the power, 2014-03-28 20:44:09]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/zea@chromium.org/211973003/100001

[commit-bot: I haz the power, 2014-03-28 23:54:33]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-28 23:54:34]

Commit queue rejected this change because the description was changed
between the time the change entered the commit queue and the time it
was ready to commit. You can safely check the commit box again.

[Nicolas Zea, 2014-03-28 23:57:47]

The CQ bit was checked by zea@chromium.org

[commit-bot: I haz the power, 2014-03-29 00:01:12]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/zea@chromium.org/211973003/100001

[commit-bot: I haz the power, 2014-03-29 00:06:37]

Change committed as 260313