[Feed] Update defaults to match launch candidate.

Bug: 1003608, 986836
Change-Id: I7412fed30fbe5d294534d648a82816689e45a444
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1802518Reviewed-by: Martin Šrámek <msramek@chromium.org>
Reviewed-by: Pavel Yatsuk <pavely@chromium.org>
Reviewed-by: Robert Kaplow <rkaplow@chromium.org>
Reviewed-by: Brandon Wylie <wylieb@chromium.org>
Reviewed-by: Dan H <harringtond@chromium.org>
Reviewed-by: Theresa  <twellington@chromium.org>
Commit-Queue: Sky Malice <skym@chromium.org>
Cr-Commit-Position: refs/heads/master@{#699510}

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

@@ -181,7 +181,7 @@ public class FeedAppLifecycle
             mDelayedInitializeStarted = true;
             boolean initFeed = ChromeFeatureList.getFieldTrialParamByFeatureAsBoolean(
                     ChromeFeatureList.INTEREST_FEED_CONTENT_SUGGESTIONS, "init_feed_after_startup",
-                    true);
+                    false);
             if (initFeed) {
                 DeferredStartupHandler.getInstance().addDeferredTask(() -> {
                     // Since this is being run asynchronously, it's possible #destroy() is called

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

@@ -119,7 +119,7 @@ public final class FeedConfiguration {
 
     private static final String SPINNER_DELAY_MS = "spinner_delay";
     /** Default value for delay before showing a spinner. */
-    public static final long SPINNER_DELAY_MS_DEFAULT = 0;
+    public static final long SPINNER_DELAY_MS_DEFAULT = 500;
 
     private static final String SPINNER_MINIMUM_SHOW_TIME_MS = "spinner_minimum_show_time";
     /** Default value for how long spinners must be shown for. */
@@ -127,7 +127,7 @@ public final class FeedConfiguration {
 
     private static final String STORAGE_MISS_THRESHOLD = "storage_miss_threshold";
     /** Default number of items that can be missing from a call to FeedStore before failing. */
-    public static final long STORAGE_MISS_THRESHOLD_DEFAULT = 4;
+    public static final long STORAGE_MISS_THRESHOLD_DEFAULT = 100;
 
     private static final String TRIGGER_IMMEDIATE_PAGINATION = "trigger_immediate_pagination";
     /** Default value for triggering immediate pagination. */

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

@@ -327,7 +327,7 @@ public class FeedAppLifecycleTest {
     public void testDelayedInitNoParam() {
         verify(mAppLifecycleListener, times(1)).onEnterForeground();
         mTestDeferredStartupHandler.runAllTasks();
-        verify(mAppLifecycleListener, times(1)).initialize();
+        verify(mAppLifecycleListener, times(0)).initialize();
     }
 
     @Test
@@ -367,7 +367,7 @@ public class FeedAppLifecycleTest {
     testDelayedInitZeroParamNotBoolean() {
         verify(mAppLifecycleListener, times(1)).onEnterForeground();
         mTestDeferredStartupHandler.runAllTasks();
-        verify(mAppLifecycleListener, times(1)).initialize();
+        verify(mAppLifecycleListener, times(0)).initialize();
     }
 
     private void signalActivityStart(Activity activity)

chrome/android/javatests/src/org/chromium/chrome/browser/offlinepages/prefetch/PrefetchFlowTest.java

@@ -22,6 +22,7 @@ import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.chrome.browser.ChromeActivity;
+import org.chromium.chrome.browser.ChromeFeatureList;
 import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.offlinepages.OfflinePageBridge;
 import org.chromium.chrome.browser.offlinepages.OfflinePageItem;
@@ -108,6 +109,8 @@ public class PrefetchFlowTest implements WebServer.RequestHandler {
         final String suggestionsBackend = Uri.encode(mServer.getBaseUrl() + "suggestions/");
         CommandLine.getInstance().appendSwitchWithValue("enable-features",
                 "OfflinePagesPrefetching<Trial,DownloadService<Trial,NTPArticleSuggestions<Trial");
+        CommandLine.getInstance().appendSwitchWithValue(
+                "disable-features", ChromeFeatureList.INTEREST_FEED_CONTENT_SUGGESTIONS + "<Trial");
         CommandLine.getInstance().appendSwitchWithValue("force-fieldtrials", "Trial/Group");
         CommandLine.getInstance().appendSwitchWithValue("force-fieldtrial-params",
                 "Trial.Group:start_up_delay_ms/100/offline_pages_backend/" + offlinePagesBackend

chrome/browser/android/feed/feed_host_service_factory.cc

@@ -138,4 +138,8 @@ content::BrowserContext* FeedHostServiceFactory::GetBrowserContextToUse(
   return context->IsOffTheRecord() ? nullptr : context;
 }
 
+bool FeedHostServiceFactory::ServiceIsNULLWhileTesting() const {
+  return true;
+}
+
 }  // namespace feed

chrome/browser/android/feed/feed_host_service_factory.h

@@ -37,6 +37,7 @@ class FeedHostServiceFactory : public BrowserContextKeyedServiceFactory {
       content::BrowserContext* context) const override;
   content::BrowserContext* GetBrowserContextToUse(
       content::BrowserContext* context) const override;
+  bool ServiceIsNULLWhileTesting() const override;
 
   DISALLOW_COPY_AND_ASSIGN(FeedHostServiceFactory);
 };

chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc

@@ -932,7 +932,11 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
 #if defined(OS_ANDROID)
 #if BUILDFLAG(ENABLE_FEED_IN_CHROME)
     if (base::FeatureList::IsEnabled(feed::kInterestFeedContentSuggestions))
-      feed::FeedLifecycleBridge::ClearCachedData();
+      // Don't bridge through if the service isn't present, which means we're
+      // probably running in a native unit test.
+      if (feed::FeedHostServiceFactory::GetForBrowserContext(profile_)) {
+        feed::FeedLifecycleBridge::ClearCachedData();
+      }
 #endif  // BUILDFLAG(ENABLE_FEED_IN_CHROME)
 #endif  // defined(OS_ANDROID)
 

chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_factory.cc

@@ -5,6 +5,8 @@
 #include "chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_factory.h"
 
 #include "base/memory/singleton.h"
+#include "build/build_config.h"
+#include "chrome/browser/android/feed/feed_host_service_factory.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
 #include "chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
@@ -31,6 +33,11 @@
 #include "chrome/browser/sessions/session_service_factory.h"
 #endif
 
+#if defined(OS_ANDROID)
+#include "components/feed/buildflags.h"
+#include "components/feed/feed_feature_list.h"
+#endif  // defined(OS_ANDROID)
+
 // static
 ChromeBrowsingDataRemoverDelegateFactory*
 ChromeBrowsingDataRemoverDelegateFactory::GetInstance() {
@@ -51,6 +58,13 @@ ChromeBrowsingDataRemoverDelegateFactory::
           BrowserContextDependencyManager::GetInstance()) {
   DependsOn(autofill::PersonalDataManagerFactory::GetInstance());
   DependsOn(DataReductionProxyChromeSettingsFactory::GetInstance());
+#if defined(OS_ANDROID)
+#if BUILDFLAG(ENABLE_FEED_IN_CHROME)
+  if (base::FeatureList::IsEnabled(feed::kInterestFeedContentSuggestions)) {
+    DependsOn(feed::FeedHostServiceFactory::GetInstance());
+  }
+#endif  // BUILDFLAG(ENABLE_FEED_IN_CHROME)
+#endif  // defined(OS_ANDROID)
   DependsOn(HistoryServiceFactory::GetInstance());
   DependsOn(HostContentSettingsMapFactory::GetInstance());
   DependsOn(PasswordStoreFactory::GetInstance());

chrome/browser/image_fetcher/image_fetcher_service_factory.cc

@@ -84,8 +84,13 @@ ImageFetcherServiceFactory::BuildServiceInstanceFor(
           std::move(data_store), std::move(metadata_store),
           profile_key->GetPrefs(), clock, task_runner);
 
-  scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory =
-      SystemNetworkContextManager::GetInstance()->GetSharedURLLoaderFactory();
+  scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory = nullptr;
+  // Network is null for some tests, may be removable after
+  // https://crbug.com/981057.
+  if (SystemNetworkContextManager::GetInstance()) {
+    url_loader_factory =
+        SystemNetworkContextManager::GetInstance()->GetSharedURLLoaderFactory();
+  }
 
   auto cached_image_fetcher_service =
       std::make_unique<image_fetcher::ImageFetcherService>(

components/feed/feed_feature_list.cc

@@ -7,7 +7,7 @@
 namespace feed {
 
 const base::Feature kInterestFeedContentSuggestions{
-    "InterestFeedContentSuggestions", base::FEATURE_DISABLED_BY_DEFAULT};
+    "InterestFeedContentSuggestions", base::FEATURE_ENABLED_BY_DEFAULT};
 
 const base::FeatureParam<std::string> kDisableTriggerTypes{
     &kInterestFeedContentSuggestions, "disable_trigger_types", ""};

testing/variations/fieldtrial_testing_config.json

@@ -3094,21 +3094,6 @@
             ]
         }
     ],
-    "InterestFeedContentSuggestions": [
-        {
-            "platforms": [
-                "android"
-            ],
-            "experiments": [
-                {
-                    "name": "Enabled",
-                    "enable_features": [
-                        "InterestFeedContentSuggestions"
-                    ]
-                }
-            ]
-        }
-    ],
     "InvalidationsGCMUpstream": [
         {
             "platforms": [