📰 Merge the has_fetch_more and has_reload actions

[NTP Client] Merge the has_fetch_more and has_reload actions

These 2 action types are redudnant now that fetch more is not behind
a flag. This patch consolidates one in a single property of
category_info.

BUG=667752
Review-Url: https://codereview.chromium.org/2663313002
Cr-Commit-Position: refs/heads/master@{#447556}
Committed: https://chromium.googlesource.com/chromium/src/+/d6270c784225d5a230201f41866c99caf6c00a2e

[dgn, 2017-01-31 20:26:20]

The CQ bit was checked by dgn@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-01-31 20:27:09]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-01-31 20:38:56]

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

[commit-bot: I haz the power, 2017-01-31 20:38:56]

Dry run: Try jobs failed on following builders:
  ios-device on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-device/builds...)
  ios-simulator on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-simulator/bui...)

[dgn, 2017-02-01 11:43:02]

The CQ bit was checked by dgn@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-02-01 11:43:13]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-02-01 12:40:14]

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

[commit-bot: I haz the power, 2017-02-01 12:40:15]

Dry run: This issue passed the CQ dry run.

[dgn, 2017-02-01 13:21:36]

dgn@chromium.org changed reviewers:
+ bauerb@chromium.org, treib@chromium.org

[dgn, 2017-02-01 13:21:37]

PTAL

[dgn, 2017-02-01 13:27:58]

https://codereview.chromium.org/2663313002/diff/40001/chrome/android/junit/sr...
File
chrome/android/junit/src/org/chromium/chrome/browser/ntp/cards/SuggestionsSectionTest.java
(right):

https://codereview.chromium.org/2663313002/diff/40001/chrome/android/junit/sr...
chrome/android/junit/src/org/chromium/chrome/browser/ntp/cards/SuggestionsSectionTest.java:363:
public void testFetchActionPriority() {
Not sure if I should remove the suggestion count dependent part of these tests.
Internally we don't care about it anymore.

[Marc Treib, 2017-02-01 13:33:42]

Yay! C++ lgtm (I didn't look at any of the Java code)

https://codereview.chromium.org/2663313002/diff/40001/components/ntp_snippets...
File components/ntp_snippets/mock_content_suggestions_provider.cc (right):

https://codereview.chromium.org/2663313002/diff/40001/components/ntp_snippets...
components/ntp_snippets/mock_content_suggestions_provider.cc:41: true, false,
Orthogonal to this CL, but since you're here: Would you mind adding
/*param_name=*/ comments for these? As it is, it's impossible to read...

[Bernhard Bauer, 2017-02-01 14:11:06]

lgtm

https://codereview.chromium.org/2663313002/diff/40001/chrome/android/junit/sr...
File
chrome/android/junit/src/org/chromium/chrome/browser/ntp/cards/SuggestionsSectionTest.java
(right):

https://codereview.chromium.org/2663313002/diff/40001/chrome/android/junit/sr...
chrome/android/junit/src/org/chromium/chrome/browser/ntp/cards/SuggestionsSectionTest.java:363:
public void testFetchActionPriority() {
On 2017/02/01 13:27:58, dgn wrote:
> Not sure if I should remove the suggestion count dependent part of these
tests.
> Internally we don't care about it anymore.

Yeah, I think that would make sense… It is intentional after all and not just
the case that we happen to show the button if there are suggestions and also
happen to show if there aren't.

[dgn, 2017-02-01 17:09:22]

The CQ bit was checked by dgn@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-02-01 17:09:32]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-02-01 17:11:30]

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

[commit-bot: I haz the power, 2017-02-01 17:11:31]

Dry run: Try jobs failed on following builders:
  ios-device on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-device/builds...)
  ios-simulator on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-simulator/bui...)
  mac_chromium_rel_ng on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_rel_...)

[dgn, 2017-02-01 17:35:41]

The CQ bit was checked by dgn@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-02-01 17:35:58]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[dgn, 2017-02-01 18:01:52]

Thanks!

https://codereview.chromium.org/2663313002/diff/40001/chrome/android/junit/sr...
File
chrome/android/junit/src/org/chromium/chrome/browser/ntp/cards/SuggestionsSectionTest.java
(right):

https://codereview.chromium.org/2663313002/diff/40001/chrome/android/junit/sr...
chrome/android/junit/src/org/chromium/chrome/browser/ntp/cards/SuggestionsSectionTest.java:363:
public void testFetchActionPriority() {
On 2017/02/01 14:11:06, Bernhard Bauer wrote:
> On 2017/02/01 13:27:58, dgn wrote:
> > Not sure if I should remove the suggestion count dependent part of these
> tests.
> > Internally we don't care about it anymore.
> 
> Yeah, I think that would make sense… It is intentional after all and not just
> the case that we happen to show the button if there are suggestions and also
> happen to show if there aren't.

Done.

https://codereview.chromium.org/2663313002/diff/40001/components/ntp_snippets...
File components/ntp_snippets/mock_content_suggestions_provider.cc (right):

https://codereview.chromium.org/2663313002/diff/40001/components/ntp_snippets...
components/ntp_snippets/mock_content_suggestions_provider.cc:41: true, false,
On 2017/02/01 13:33:42, Marc Treib wrote:
> Orthogonal to this CL, but since you're here: Would you mind adding
> /*param_name=*/ comments for these? As it is, it's impossible to read...

Done.

[dgn, 2017-02-01 18:01:59]

The CQ bit was unchecked by dgn@chromium.org

[dgn, 2017-02-01 18:02:01]

The CQ bit was checked by dgn@chromium.org

[dgn, 2017-02-01 18:02:01]

The patchset sent to the CQ was uploaded after l-g-t-m from treib@chromium.org,
bauerb@chromium.org
Link to the patchset: https://codereview.chromium.org/2663313002/#ps80001
(title: "rebase")

[commit-bot: I haz the power, 2017-02-01 18:02:29]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-02-01 18:22:36]

CQ is committing da patch.

Bot data: {"patchset_id": 80001, "attempt_start_ts": 1485972121097010,
"parent_rev": "4514f7fe2ade68854f2b7718428740131493bdcb", "commit_rev":
"d6270c784225d5a230201f41866c99caf6c00a2e"}

[commit-bot: I haz the power, 2017-02-01 18:23:16]

Description was changed from

==========
[NTP Client] Merge the has_fetch_more and has_reload actions

These 2 action types are redudnant now that fetch more is not behind
a flag. This patch consolidates one in a single property of
category_info.

BUG=667752
==========

to

==========
[NTP Client] Merge the has_fetch_more and has_reload actions

These 2 action types are redudnant now that fetch more is not behind
a flag. This patch consolidates one in a single property of
category_info.

BUG=667752

Review-Url: https://codereview.chromium.org/2663313002
Cr-Commit-Position: refs/heads/master@{#447556}
Committed:
https://chromium.googlesource.com/chromium/src/+/d6270c784225d5a230201f41866c...
==========

[commit-bot: I haz the power, 2017-02-01 18:23:18]

Committed patchset #5 (id:80001) as
https://chromium.googlesource.com/chromium/src/+/d6270c784225d5a230201f41866c...