The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/15a0b4f782f55474f51b073f583a974b5f2bf63f

commit 15a0b4f782f55474f51b073f583a974b5f2bf63f
Author: romax <romax@chromium.org>
Date: Thu Mar 23 23:23:12 2017

[Offline Pages] Add Android version check for timeout in offliner policy.

Since the doze mode only exists after Android 6.0, adding a check in order
to change to a longer timeout when the system has no doze mode.

BUG=701035

Review-Url: https://codereview.chromium.org/2755753005
Cr-Commit-Position: refs/heads/master@{#459274}

[modify] https://crrev.com/15a0b4f782f55474f51b073f583a974b5f2bf63f/components/offline_pages/core/background/offliner_policy.h
[modify] https://crrev.com/15a0b4f782f55474f51b073f583a974b5f2bf63f/components/offline_pages/core/background/pick_request_task_unittest.cc
[modify] https://crrev.com/15a0b4f782f55474f51b073f583a974b5f2bf63f/components/offline_pages/core/background/request_coordinator_unittest.cc

Hey, I am reopening this, as I am seeing contradicting information in the documentation of GcmTaskService:
https://developers.google.com/android/reference/com/google/android/gms/gcm/GcmTaskService
"""
The scheduler will hold a PowerManager.WakeLock for your service, however after three minutes of execution if your task has not returned it will be considered to have timed out, and the wakelock will be released. Rescheduling your task (returning RESULT_RESCHEDULE) at this point will have no effect.

If you suspect your task will run longer than this, you should start your own service explicitly or use some other mechanism; this API is intended for relatively quick network operations.
"""

I think this also make the current timeout on CBSWaiter (4 minutes) invalid, as the task will likely be killed at 3 minutes based on the comment above.

https://cs.chromium.org/chromium/src/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackgroundService.java?l=47&dr=CSs

Please rethink this problem. (I'd start from reverting the patch, unless you are absolutely sure this is right.)

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/3321d7f0ab6782ed8e316e5b94b21aad2c77a603

commit 3321d7f0ab6782ed8e316e5b94b21aad2c77a603
Author: romax <romax@chromium.org>
Date: Mon Mar 27 18:29:05 2017

Revert of [Offline Pages] Add Android version check for timeout in offliner policy. (patchset #4 id:80001 of https://codereview.chromium.org/2755753005/ )

Reason for revert:
As described in the bug by fgorski@, we shouldn't go longer than 3 minutes since that's the timeout on GCMNetworkManager.

Original issue's description:
> [Offline Pages] Add Android version check for timeout in offliner policy.
>
> Since the doze mode only exists after Android 6.0, adding a check in order
> to change to a longer timeout when the system has no doze mode.
>
> BUG=701035
>
> Review-Url: https://codereview.chromium.org/2755753005
> Cr-Commit-Position: refs/heads/master@{#459274}
> Committed: https://chromium.googlesource.com/chromium/src/+/15a0b4f782f55474f51b073f583a974b5f2bf63f

TBR=petewil@chromium.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=701035

Review-Url: https://codereview.chromium.org/2776203003
Cr-Commit-Position: refs/heads/master@{#459836}

[modify] https://crrev.com/3321d7f0ab6782ed8e316e5b94b21aad2c77a603/components/offline_pages/core/background/offliner_policy.h
[modify] https://crrev.com/3321d7f0ab6782ed8e316e5b94b21aad2c77a603/components/offline_pages/core/background/pick_request_task_unittest.cc
[modify] https://crrev.com/3321d7f0ab6782ed8e316e5b94b21aad2c77a603/components/offline_pages/core/background/request_coordinator_unittest.cc

Romax - This is fixed, right?

This was fixed but got reverted due to the reason mentioned in #3. And i'm not sure what should be done next to fix the issue.