Ntp: show footer with learn more link.

Ntp: show footer with learn more link.

BUG=637257
Committed: https://crrev.com/35978862e4fc752f742ab01d6ab0883b99cfd374
Cr-Commit-Position: refs/heads/master@{#414738}

[Michael van Ouwerkerk, 2016-08-24 14:38:46]

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

[Michael van Ouwerkerk, 2016-08-24 14:39:08]

mvanouwerkerk@chromium.org changed reviewers:
+ bauerb@chromium.org

[Michael van Ouwerkerk, 2016-08-24 14:39:08]

Bernhard, could you take a look please?

[commit-bot: I haz the power, 2016-08-24 14:39:11]

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

[Bernhard Bauer, 2016-08-24 14:44:06]

LGTM, but can you remove "zine" from the CL title? We don't use code names in
reviews.

https://codereview.chromium.org/2275693003/diff/1/chrome/android/java/src/org...
File chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java
(right):

https://codereview.chromium.org/2275693003/diff/1/chrome/android/java/src/org...
chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java:258: if
(!switchToExistingTab(url)) {
This was an experiment to refocus existing tabs when opening tiles, but I don't
think we need it for opening a Help Center article.

[commit-bot: I haz the power, 2016-08-24 14:45:48]

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

[commit-bot: I haz the power, 2016-08-24 14:45:49]

Dry run: Try jobs failed on following builders:
  chromium_presubmit on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/chromium_presub...)

[Michael van Ouwerkerk, 2016-08-24 14:46:25]

Description was changed from

==========
Ntp zine: show footer with learn more link.

BUG=637257
==========

to

==========
Ntp: show footer with learn more link.

BUG=637257
==========

[Michael van Ouwerkerk, 2016-08-24 14:56:13]

All done. Thanks!

https://codereview.chromium.org/2275693003/diff/1/chrome/android/java/src/org...
File chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java
(right):

https://codereview.chromium.org/2275693003/diff/1/chrome/android/java/src/org...
chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java:258: if
(!switchToExistingTab(url)) {
On 2016/08/24 14:44:06, Bernhard Bauer wrote:
> This was an experiment to refocus existing tabs when opening tiles, but I
don't
> think we need it for opening a Help Center article.

Done.

[Michael van Ouwerkerk, 2016-08-24 14:56:23]

The CQ bit was checked by mvanouwerkerk@chromium.org

[Michael van Ouwerkerk, 2016-08-24 14:56:23]

The patchset sent to the CQ was uploaded after l-g-t-m from bauerb@chromium.org
Link to the patchset: https://codereview.chromium.org/2275693003/#ps20001
(title: "Address review comments from bauerb.")

[commit-bot: I haz the power, 2016-08-24 14:56:42]

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, 2016-08-24 15:04:06]

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

[commit-bot: I haz the power, 2016-08-24 15:04:07]

Try jobs failed on following builders:
  chromium_presubmit on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/chromium_presub...)

[Michael van Ouwerkerk, 2016-08-24 15:30:02]

The CQ bit was checked by mvanouwerkerk@chromium.org

[Michael van Ouwerkerk, 2016-08-24 15:30:02]

The patchset sent to the CQ was uploaded after l-g-t-m from bauerb@chromium.org
Link to the patchset: https://codereview.chromium.org/2275693003/#ps40001
(title: "Rebase.")

[commit-bot: I haz the power, 2016-08-24 15:30:36]

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, 2016-08-24 15:38:14]

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

[commit-bot: I haz the power, 2016-08-24 15:38:16]

Try jobs failed on following builders:
  chromium_presubmit on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/chromium_presub...)

[Michael van Ouwerkerk, 2016-08-24 15:49:18]

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

[commit-bot: I haz the power, 2016-08-24 15:49:42]

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

[Michael van Ouwerkerk, 2016-08-24 16:09:51]

The CQ bit was checked by mvanouwerkerk@chromium.org

[Michael van Ouwerkerk, 2016-08-24 16:09:51]

The patchset sent to the CQ was uploaded after l-g-t-m from bauerb@chromium.org
Link to the patchset: https://codereview.chromium.org/2275693003/#ps100001
(title: "Undo presubmit change.")

[commit-bot: I haz the power, 2016-08-24 16:10:23]

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, 2016-08-24 18:18:09]

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

[commit-bot: I haz the power, 2016-08-24 18:18:10]

Try jobs failed on following builders:
  linux_android_rel_ng on master.tryserver.chromium.android (JOB_FAILED,
https://build.chromium.org/p/tryserver.chromium.android/builders/linux_androi...)

[Michael van Ouwerkerk, 2016-08-26 11:45:52]

The CQ bit was checked by mvanouwerkerk@chromium.org

[Michael van Ouwerkerk, 2016-08-26 11:45:52]

The patchset sent to the CQ was uploaded after l-g-t-m from bauerb@chromium.org
Link to the patchset: https://codereview.chromium.org/2275693003/#ps120001
(title: "Fix NewTabPageAdapterTest.")

[commit-bot: I haz the power, 2016-08-26 11:46:11]

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, 2016-08-26 11:48:54]

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

[commit-bot: I haz the power, 2016-08-26 11:48:55]

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...)

[Michael van Ouwerkerk, 2016-08-26 12:54:56]

The CQ bit was checked by mvanouwerkerk@chromium.org

[Michael van Ouwerkerk, 2016-08-26 12:54:57]

The patchset sent to the CQ was uploaded after l-g-t-m from bauerb@chromium.org
Link to the patchset: https://codereview.chromium.org/2275693003/#ps140001
(title: "Rebase to fix merge conflict.")

[commit-bot: I haz the power, 2016-08-26 12:55:09]

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, 2016-08-26 13:58:32]

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

[commit-bot: I haz the power, 2016-08-26 13:58:33]

Failed to apply patch for
chrome/android/junit/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapterTest.java:
While running git apply --index -3 -p1;
  error: patch failed:
chrome/android/junit/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapterTest.java:301
  Falling back to three-way merge...
  Applied patch to
'chrome/android/junit/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapterTest.java'
with conflicts.
  U
chrome/android/junit/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapterTest.java

Patch:      
chrome/android/junit/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapterTest.java
Index:
chrome/android/junit/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapterTest.java
diff --git
a/chrome/android/junit/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapterTest.java
b/chrome/android/junit/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapterTest.java
index
d1db744501ebe5a6cdc26accfe965b85a7afc742..4661459d1b5032aa8be53183882f67d57c42c3a0
100644
---
a/chrome/android/junit/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapterTest.java
+++
b/chrome/android/junit/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapterTest.java
@@ -38,24 +38,24 @@ public class NewTabPageAdapterTest {
         org.robolectric.shadows.ShadowLog.stream = System.out;
     }
 
-    private FakeSuggestionsSource mSnippetsSource = new
FakeSuggestionsSource();
-    private NewTabPageAdapter mNtpAdapter;
+    private FakeSuggestionsSource mSource;
+    private NewTabPageAdapter mAdapter;
 
     /**
-     * Asserts that {@link #mNtpAdapter}.{@link
NewTabPageAdapter#getItemCount()} corresponds to an
+     * Asserts that {@link #mAdapter}.{@link NewTabPageAdapter#getItemCount()}
corresponds to an
      * NTP with the given sections in it.
      * @param sections A list of sections, each represented by the number of
items that are required
-     *                 to represent it on the UI. For readability, these
numbers should be generated
+     *                 to represent it in the UI. For readability, these
numbers should be generated
      *                 with the methods below.
      */
     private void assertItemsFor(int... sections) {
         int expectedCount = 1; // above-the-fold.
         for (int section : sections) expectedCount += section;
-        if (sections.length > 0) expectedCount += 1; // bottom spacer.
-        int actualCount = mNtpAdapter.getItemCount();
+        if (sections.length > 0) expectedCount += 2; // footer and bottom
spacer.
+        int actualCount = mAdapter.getItemCount();
         assertEquals("Expected " + expectedCount + " items, but the following "
+ actualCount
-                        + " were present: " + mNtpAdapter.getItems(),
-                expectedCount, mNtpAdapter.getItemCount());
+                        + " were present: " + mAdapter.getItems(),
+                expectedCount, mAdapter.getItemCount());
     }
 
     /**
@@ -115,156 +115,153 @@ public class NewTabPageAdapterTest {
         RecordHistogram.disableForTests();
         RecordUserAction.disableForTests();
 
-        mSnippetsSource = new FakeSuggestionsSource();
-        mSnippetsSource.setStatusForCategory(KnownCategories.ARTICLES,
CategoryStatus.INITIALIZING);
-        mSnippetsSource.setInfoForCategory(
-                KnownCategories.ARTICLES,
-                new SuggestionsCategoryInfo(
-                        "Articles for you",
ContentSuggestionsCardLayout.FULL_CARD, false, true));
-        mNtpAdapter = new NewTabPageAdapter(null, null, mSnippetsSource, null);
+        mSource = new FakeSuggestionsSource();
+        mSource.setStatusForCategory(KnownCategories.ARTICLES,
CategoryStatus.INITIALIZING);
+        mSource.setInfoForCategory(KnownCategories.ARTICLES,
+                new SuggestionsCategoryInfo("Articles for you",
+                                          
ContentSuggestionsCardLayout.FULL_CARD, false, true));
+        mAdapter = new NewTabPageAdapter(null, null, mSource, null);
     }
 
     /**
-     * Tests the content of the adapter under standard conditions: on start and
after a snippet
+     * Tests the content of the adapter under standard conditions: on start and
after a suggestions
      * fetch.
      */
     @Test
     @Feature({"Ntp"})
-    public void testSnippetLoading() {
+    public void testSuggestionLoading() {
         assertItemsFor(sectionWithStatusCard());
-        assertEquals(NewTabPageItem.VIEW_TYPE_ABOVE_THE_FOLD,
mNtpAdapter.getItemViewType(0));
-        assertEquals(NewTabPageItem.VIEW_TYPE_HEADER,
mNtpAdapter.getItemViewType(1));
-        assertEquals(NewTabPageItem.VIEW_TYPE_STATUS,
mNtpAdapter.getItemViewType(2));
-        assertEquals(NewTabPageItem.VIEW_TYPE_PROGRESS,
mNtpAdapter.getItemViewType(3));
-        assertEquals(NewTabPageItem.VIEW_TYPE_SPACING,
mNtpAdapter.getItemViewType(4));
-
-        List<SnippetArticle> snippets = createDummySnippets(3);
-        mSnippetsSource.setStatusForCategory(KnownCategories.ARTICLES,
CategoryStatus.AVAILABLE);
-        mSnippetsSource.setSuggestionsForCategory(KnownCategories.ARTICLES,
snippets);
-
-        List<NewTabPageItem> loadedItems = new
ArrayList<>(mNtpAdapter.getItems());
-        assertEquals(NewTabPageItem.VIEW_TYPE_ABOVE_THE_FOLD,
mNtpAdapter.getItemViewType(0));
-        assertEquals(NewTabPageItem.VIEW_TYPE_HEADER,
mNtpAdapter.getItemViewType(1));
+        assertEquals(NewTabPageItem.VIEW_TYPE_ABOVE_THE_FOLD,
mAdapter.getItemViewType(0));
+        assertEquals(NewTabPageItem.VIEW_TYPE_HEADER,
mAdapter.getItemViewType(1));
+        assertEquals(NewTabPageItem.VIEW_TYPE_STATUS,
mAdapter.getItemViewType(2));
+        assertEquals(NewTabPageItem.VIEW_TYPE_PROGRESS,
mAdapter.getItemViewType(3));
+        assertEquals(NewTabPageItem.VIEW_TYPE_FOOTER,
mAdapter.getItemViewType(4));
+        assertEquals(NewTabPageItem.VIEW_TYPE_SPACING,
mAdapter.getItemViewType(5));
+
+        List<SnippetArticle> suggestions = createDummySuggestions(3);
+        mSource.setStatusForCategory(KnownCategories.ARTICLES,
CategoryStatus.AVAILABLE);
+        mSource.setSuggestionsForCategory(KnownCategories.ARTICLES,
suggestions);
+
+        List<NewTabPageItem> loadedItems = new
ArrayList<>(mAdapter.getItems());
+        assertEquals(NewTabPageItem.VIEW_TYPE_ABOVE_THE_FOLD,
mAdapter.getItemViewType(0));
+        assertEquals(NewTabPageItem.VIEW_TYPE_HEADER,
mAdapter.getItemViewType(1));
         // From the loadedItems, cut out aboveTheFold and header from the
front,
-        // and bottom spacer from the back.
-        assertEquals(snippets, loadedItems.subList(2, loadedItems.size() - 1));
-        assertEquals(NewTabPageItem.VIEW_TYPE_SPACING,
-                mNtpAdapter.getItemViewType(loadedItems.size() - 1));
+        // and footer and bottom spacer from the back.
+        assertEquals(suggestions, loadedItems.subList(2, loadedItems.size() -
2));
+        assertEquals(
+                NewTabPageItem.VIEW_TYPE_FOOTER,
mAdapter.getItemViewType(loadedItems.size() - 2));
+        assertEquals(
+                NewTabPageItem.VIEW_TYPE_SPACING,
mAdapter.getItemViewType(loadedItems.size() - 1));
 
         // The adapter should ignore any new incoming data.
-        mSnippetsSource.setSuggestionsForCategory(KnownCategories.ARTICLES,
-                Arrays.asList(new SnippetArticle[] {new SnippetArticle(
-                        0, "foo", "title1", "pub1", "txt1", "foo", "bar", 0, 0,
0,
-                        ContentSuggestionsCardLayout.FULL_CARD)}));
-        assertEquals(loadedItems, mNtpAdapter.getItems());
+        mSource.setSuggestionsForCategory(KnownCategories.ARTICLES,
+                Arrays.asList(new SnippetArticle[] {new SnippetArticle(0,
"foo", "title1", "pub1",
+                        "txt1", "foo", "bar", 0, 0, 0,
ContentSuggestionsCardLayout.FULL_CARD)}));
+        assertEquals(loadedItems, mAdapter.getItems());
     }
 
     /**
-     * Tests that the adapter keeps listening for snippet updates if it didn't
get anything from
+     * Tests that the adapter keeps listening for suggestion updates if it
didn't get anything from
      * a previous fetch.
      */
     @Test
     @Feature({"Ntp"})
-    public void testSnippetLoadingInitiallyEmpty() {
+    public void testSuggestionLoadingInitiallyEmpty() {
         // If we don't get anything, we should be in the same situation as the
initial one.
-        mSnippetsSource.setSuggestionsForCategory(
+        mSource.setSuggestionsForCategory(
                 KnownCategories.ARTICLES, new ArrayList<SnippetArticle>());
         assertItemsFor(sectionWithStatusCard());
-        assertEquals(NewTabPageItem.VIEW_TYPE_ABOVE_THE_FOLD,
mNtpAdapter.getItemViewType(0));
-        assertEquals(NewTabPageItem.VIEW_TYPE_HEADER,
mNtpAdapter.getItemViewType(1));
-        assertEquals(NewTabPageItem.VIEW_TYPE_STATUS,
mNtpAdapter.getItemViewType(2));
-        assertEquals(NewTabPageItem.VIEW_TYPE_PROGRESS,
mNtpAdapter.getItemViewType(3));
-        assertEquals(NewTabPageItem.VIEW_TYPE_SPACING,
mNtpAdapter.getItemViewType(4));
-
-        // We should load new snippets when we get notified about them.
-        List<SnippetArticle> snippets = createDummySnippets(5);
-        mSnippetsSource.setStatusForCategory(KnownCategories.ARTICLES,
CategoryStatus.AVAILABLE);
-        mSnippetsSource.setSuggestionsForCategory(KnownCategories.ARTICLES,
snippets);
-        List<NewTabPageItem> loadedItems = new
ArrayList<>(mNtpAdapter.getItems());
-        assertEquals(NewTabPageItem.VIEW_TYPE_ABOVE_THE_FOLD,
mNtpAdapter.getItemViewType(0));
-        assertEquals(NewTabPageItem.VIEW_TYPE_HEADER,
mNtpAdapter.getItemViewType(1));
+        assertEquals(NewTabPageItem.VIEW_TYPE_ABOVE_THE_FOLD,
mAdapter.getItemViewType(0));
+        assertEquals(NewTabPageItem.VIEW_TYPE_HEADER,
mAdapter.getItemViewType(1));
+        assertEquals(NewTabPageItem.VIEW_TYPE_STATUS,
mAdapter.getItemViewType(2));
+        assertEquals(NewTabPag…
(message too large)

[Michael van Ouwerkerk, 2016-08-26 14:29:28]

The CQ bit was checked by mvanouwerkerk@chromium.org

[Michael van Ouwerkerk, 2016-08-26 14:29:28]

The patchset sent to the CQ was uploaded after l-g-t-m from bauerb@chromium.org
Link to the patchset: https://codereview.chromium.org/2275693003/#ps160001
(title: "Rebase on tot.")

[commit-bot: I haz the power, 2016-08-26 14:29:50]

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

[Michael van Ouwerkerk, 2016-08-26 15:22:19]

The CQ bit was unchecked by mvanouwerkerk@chromium.org

[Michael van Ouwerkerk, 2016-08-26 15:37:58]

The CQ bit was checked by mvanouwerkerk@chromium.org

[Michael van Ouwerkerk, 2016-08-26 15:37:59]

The patchset sent to the CQ was uploaded after l-g-t-m from bauerb@chromium.org
Link to the patchset: https://codereview.chromium.org/2275693003/#ps180001
(title: "Rebase on tot. Again. Use help center url.")

[commit-bot: I haz the power, 2016-08-26 15:38:33]

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

[Michael van Ouwerkerk, 2016-08-26 15:51:56]

The CQ bit was unchecked by mvanouwerkerk@chromium.org

[Michael van Ouwerkerk, 2016-08-26 15:57:32]

The CQ bit was checked by mvanouwerkerk@chromium.org

[Michael van Ouwerkerk, 2016-08-26 15:57:32]

The patchset sent to the CQ was uploaded after l-g-t-m from bauerb@chromium.org
Link to the patchset: https://codereview.chromium.org/2275693003/#ps200001
(title: "Use the intended url.")

[commit-bot: I haz the power, 2016-08-26 15:57:53]

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, 2016-08-26 17:16:24]

Description was changed from

==========
Ntp: show footer with learn more link.

BUG=637257
==========

to

==========
Ntp: show footer with learn more link.

BUG=637257
==========

[commit-bot: I haz the power, 2016-08-26 17:16:26]

Committed patchset #11 (id:200001)

[commit-bot: I haz the power, 2016-08-26 17:19:49]

Description was changed from

==========
Ntp: show footer with learn more link.

BUG=637257
==========

to

==========
Ntp: show footer with learn more link.

BUG=637257

Committed: https://crrev.com/35978862e4fc752f742ab01d6ab0883b99cfd374
Cr-Commit-Position: refs/heads/master@{#414738}
==========

[commit-bot: I haz the power, 2016-08-26 17:19:50]

Patchset 11 (id:??) landed as
https://crrev.com/35978862e4fc752f742ab01d6ab0883b99cfd374
Cr-Commit-Position: refs/heads/master@{#414738}