[Feed] Fixing scroll state issue when returning to the feed.

Bug: 998907, 1013648
Change-Id: I8925f0d1a4cf7a5c58097ecc0a6e2f31bebd8d5a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1874092Reviewed-by: Dan H <harringtond@chromium.org>
Commit-Queue: Jonathan Freed <freedjm@chromium.org>
Cr-Commit-Position: refs/heads/master@{#709154}

chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedConfiguration.java

@@ -22,7 +22,7 @@ public final class FeedConfiguration {
 
     private static final String ABANDON_RESTORE_BELOW_FOLD = "abandon_restore_below_fold";
     /** Default value for whether to restore below fold. */
-    public static final boolean ABANDON_RESTORE_BELOW_FOLD_DEFAULT = true;
+    public static final boolean ABANDON_RESTORE_BELOW_FOLD_DEFAULT = false;
 
     private static final String CARD_MENU_TOOLTIP_ELIGIBLE = "card_menu_tooltip_eligible";
     /** Default value for if card menus should have tooltips enabled. */
@@ -35,7 +35,7 @@ public final class FeedConfiguration {
     private static final String CONSUME_SYNTHETIC_TOKENS_WHILE_RESTORING =
             "consume_synthetic_tokens_while_restoring_bool";
     /** Default value for whether to consumer synthetic tokens on restore. */
-    public static final boolean CONSUME_SYNTHETIC_TOKENS_WHILE_RESTORING_DEFAULT = false;
+    public static final boolean CONSUME_SYNTHETIC_TOKENS_WHILE_RESTORING_DEFAULT = true;
 
     private static final String DEFAULT_ACTION_TTL_SECONDS = "default_action_ttl_seconds";
     /** Default value for the TTL of default action (3 days). */

chrome/android/javatests/src/org/chromium/chrome/browser/feed/FeedConfigurationTest.java

@@ -405,14 +405,14 @@ public class FeedConfigurationTest {
     @Features.EnableFeatures({ChromeFeatureList.INTEREST_FEED_CONTENT_SUGGESTIONS})
     public void testCreateConfiguration() {
         Configuration configuration = FeedConfiguration.createConfiguration();
-        Assert.assertTrue(
-                configuration.getValueOrDefault(ConfigKey.ABANDON_RESTORE_BELOW_FOLD, false));
+        Assert.assertFalse(
+                configuration.getValueOrDefault(ConfigKey.ABANDON_RESTORE_BELOW_FOLD, true));
         Assert.assertFalse(
                 configuration.getValueOrDefault(ConfigKey.CARD_MENU_TOOLTIP_ELIGIBLE, true));
         Assert.assertFalse(
                 configuration.getValueOrDefault(ConfigKey.CONSUME_SYNTHETIC_TOKENS, true));
-        Assert.assertFalse(configuration.getValueOrDefault(
-                ConfigKey.CONSUME_SYNTHETIC_TOKENS_WHILE_RESTORING, true));
+        Assert.assertTrue(configuration.getValueOrDefault(
+                ConfigKey.CONSUME_SYNTHETIC_TOKENS_WHILE_RESTORING, false));
         Assert.assertEquals((long) FeedConfiguration.DEFAULT_ACTION_TTL_SECONDS_DEFAULT,
                 configuration.getValueOrDefault(ConfigKey.DEFAULT_ACTION_TTL_SECONDS, 0));
         Assert.assertEquals(FeedConfiguration.FEED_ACTION_SERVER_ENDPOINT_DEFAULT,