[Feed] Import feed@90b20079146d28dee623666a432dc76d018f66dc

No Sizes info for this DEPs roll since the CL
https://chromium-review.googlesource.com/c/chromium/src/+/1478174,
the CL using FeedHostServiceFactory in internal page's code, and when
compile when the Feed disabled, we got compile error.


Change-Id: I5cdea66b8fb4ffdc25ec759c59663e644e51ab30
Reviewed-on: https://chromium-review.googlesource.com/c/1487951
Commit-Queue: Gang Wu <gangwu@chromium.org>
Reviewed-by: Sky Malice <skym@chromium.org>
Cr-Commit-Position: refs/heads/master@{#635582}

DEPS

@@ -206,7 +206,7 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling feed
   # and whatever else without interference from each other.
-  'feed_revision': '3d231444a760596e7a173c775a84dd3821b7ae40',
+  'feed_revision': '90b20079146d28dee623666a432dc76d018f66dc',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling android_sdk_build-tools_version
   # and whatever else without interference from each other.

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

@@ -14,6 +14,7 @@ import com.google.android.libraries.feed.host.logging.ElementLoggingData;
 import com.google.android.libraries.feed.host.logging.ElementType;
 import com.google.android.libraries.feed.host.logging.InternalFeedError;
 import com.google.android.libraries.feed.host.logging.RequestReason;
+import com.google.android.libraries.feed.host.logging.SessionEvent;
 import com.google.android.libraries.feed.host.logging.SpinnerType;
 import com.google.android.libraries.feed.host.logging.ZeroStateShowReason;
 
@@ -255,6 +256,12 @@ public class FeedLoggingBridge implements BasicLoggingApi {
         // TODO(https://crbug.com/924739): Implementation.
     }
 
+    @Override
+    public void onInitialSessionEvent(
+            @SessionEvent int sessionEvent, int timeFromRegisteringMs, int sessionCount) {
+        // TODO(https://crbug.com/924739): Implementation.
+    }
+
     /**
      * Reports how long a user spends on the page.
      *

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

@@ -363,7 +363,7 @@ public class FeedNewTabPage extends NewTabPage {
                                 new BasicCardConfiguration(
                                         chromeActivity.getResources(), mUiConfig),
                                 new BasicSnackbarApi(mNewTabPageManager.getSnackbarManager()),
-                                loggingBridge, offlineIndicator)
+                                offlineIndicator)
                         .build();
 
         mStream = streamScope.getStream();

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

@@ -139,10 +139,11 @@ public class FeedProcessScopeFactory {
         NetworkClient networkClient = sTestNetworkClient == null ?
             new FeedNetworkBridge(profile) : sTestNetworkClient;
         sFeedLoggingBridge = new FeedLoggingBridge(profile);
-        sFeedProcessScope = new FeedProcessScope
+        sFeedProcessScope =
+                new FeedProcessScope
                         .Builder(configHostApi, Executors.newSingleThreadExecutor(),
-                                            new LoggingApiImpl(), networkClient, schedulerBridge,
-                                            lifecycleListener, DebugBehavior.SILENT,
+                                new LoggingApiImpl(), sFeedLoggingBridge, networkClient,
+                                schedulerBridge, lifecycleListener, DebugBehavior.SILENT,
                                 ContextUtils.getApplicationContext(), applicationInfo)
                         .setContentStorage(contentStorage)
                         .setJournalStorage(journalStorage)
@@ -172,18 +173,18 @@ public class FeedProcessScopeFactory {
         Configuration configHostApi = FeedConfiguration.createConfiguration();
 
         sFeedScheduler = feedScheduler;
+        sFeedLoggingBridge = loggingBridge;
+        sFeedOfflineIndicator = feedOfflineIndicator;
+        sFeedAppLifecycle = feedAppLifecycle;
         ApplicationInfo applicationInfo =
                 new ApplicationInfo.Builder(ContextUtils.getApplicationContext()).build();
 
         sFeedProcessScope = new FeedProcessScope
                                     .Builder(configHostApi, Executors.newSingleThreadExecutor(),
-                                            new LoggingApiImpl(), networkClient, sFeedScheduler,
-                                            lifecycleListener, DebugBehavior.SILENT,
+                                            new LoggingApiImpl(), sFeedLoggingBridge, networkClient,
+                                            sFeedScheduler, lifecycleListener, DebugBehavior.SILENT,
                                             ContextUtils.getApplicationContext(), applicationInfo)
                                     .build();
-        sFeedOfflineIndicator = feedOfflineIndicator;
-        sFeedAppLifecycle = feedAppLifecycle;
-        sFeedLoggingBridge = loggingBridge;
     }
 
     /** Use supplied NetworkClient instead of real one, for tests. */

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

@@ -10,7 +10,6 @@ import com.google.android.libraries.feed.common.functional.Consumer;
 import com.google.android.libraries.feed.common.logging.Logger;
 import com.google.android.libraries.feed.feedrequestmanager.FeedRequestManager;
 import com.google.android.libraries.feed.host.config.Configuration;
-import com.google.android.libraries.feed.host.config.Configuration.ConfigKey;
 import com.google.android.libraries.feed.host.network.HttpRequest;
 import com.google.android.libraries.feed.host.network.HttpRequest.HttpMethod;
 import com.google.android.libraries.feed.host.network.HttpResponse;
@@ -50,7 +49,7 @@ public class TestNetworkClient implements NetworkClient {
         mExtensionRegistry = ExtensionRegistryLite.newInstance();
         mExtensionRegistry.add(FeedRequest.feedRequest);
         // TODO(aluo): Add ability to delay responses.
-        mResponseDelay = config.getValueOrDefault(ConfigKey.MOCK_SERVER_DELAY_MS, 0L);
+        mResponseDelay = 0L;
         mMockServer = MockServer.getDefaultInstance();
     }
 

third_party/feed/README.chromium

@@ -2,7 +2,7 @@ Name: Feed
 Short name: feed
 URL: https://chromium.googlesource.com/feed
 Version: 0
-Revision: 3d231444a760596e7a173c775a84dd3821b7ae40
+Revision: 90b20079146d28dee623666a432dc76d018f66dc
 License: Apache 2.0
 License File: LICENSE
 Security Critical: yes

third_party/feed/java_sources.gni

@@ -41,12 +41,13 @@ feed_lib_java_sources = [
   "src/src/main/java/com/google/android/libraries/feed/api/scope/FeedProcessScope.java",
   "src/src/main/java/com/google/android/libraries/feed/api/scope/FeedStreamScope.java",
   "src/src/main/java/com/google/android/libraries/feed/api/sessionmanager/SessionManager.java",
-  "src/src/main/java/com/google/android/libraries/feed/api/store/ActionMutation.java",
   "src/src/main/java/com/google/android/libraries/feed/api/store/ContentMutation.java",
+  "src/src/main/java/com/google/android/libraries/feed/api/store/LocalActionMutation.java",
   "src/src/main/java/com/google/android/libraries/feed/api/store/SemanticPropertiesMutation.java",
   "src/src/main/java/com/google/android/libraries/feed/api/store/SessionMutation.java",
   "src/src/main/java/com/google/android/libraries/feed/api/store/Store.java",
   "src/src/main/java/com/google/android/libraries/feed/api/store/StoreListener.java",
+  "src/src/main/java/com/google/android/libraries/feed/api/store/UploadableActionMutation.java",
   "src/src/main/java/com/google/android/libraries/feed/api/stream/ContentChangedListener.java",
   "src/src/main/java/com/google/android/libraries/feed/api/stream/Header.java",
   "src/src/main/java/com/google/android/libraries/feed/api/stream/NonDismissibleHeader.java",
@@ -147,16 +148,17 @@ feed_lib_java_sources = [
   "src/src/main/java/com/google/android/libraries/feed/feedstore/ContentStorageDirectImpl.java",
   "src/src/main/java/com/google/android/libraries/feed/feedstore/FeedStore.java",
   "src/src/main/java/com/google/android/libraries/feed/feedstore/JournalStorageDirectImpl.java",
-  "src/src/main/java/com/google/android/libraries/feed/feedstore/internal/ActionGc.java",
   "src/src/main/java/com/google/android/libraries/feed/feedstore/internal/ClearableStore.java",
   "src/src/main/java/com/google/android/libraries/feed/feedstore/internal/ContentGc.java",
   "src/src/main/java/com/google/android/libraries/feed/feedstore/internal/EphemeralFeedStore.java",
-  "src/src/main/java/com/google/android/libraries/feed/feedstore/internal/FeedActionMutation.java",
   "src/src/main/java/com/google/android/libraries/feed/feedstore/internal/FeedContentMutation.java",
+  "src/src/main/java/com/google/android/libraries/feed/feedstore/internal/FeedLocalActionMutation.java",
   "src/src/main/java/com/google/android/libraries/feed/feedstore/internal/FeedSemanticPropertiesMutation.java",
   "src/src/main/java/com/google/android/libraries/feed/feedstore/internal/FeedSessionMutation.java",
   "src/src/main/java/com/google/android/libraries/feed/feedstore/internal/FeedStoreConstants.java",
   "src/src/main/java/com/google/android/libraries/feed/feedstore/internal/FeedStoreHelper.java",
+  "src/src/main/java/com/google/android/libraries/feed/feedstore/internal/FeedUploadableActionMutation.java",
+  "src/src/main/java/com/google/android/libraries/feed/feedstore/internal/LocalActionGc.java",
   "src/src/main/java/com/google/android/libraries/feed/feedstore/internal/PersistentFeedStore.java",
   "src/src/main/java/com/google/android/libraries/feed/host/action/ActionApi.java",
   "src/src/main/java/com/google/android/libraries/feed/host/action/ActionEnabledApi.java",
@@ -175,6 +177,7 @@ feed_lib_java_sources = [
   "src/src/main/java/com/google/android/libraries/feed/host/logging/InternalFeedError.java",
   "src/src/main/java/com/google/android/libraries/feed/host/logging/LoggingApi.java",
   "src/src/main/java/com/google/android/libraries/feed/host/logging/RequestReason.java",
+  "src/src/main/java/com/google/android/libraries/feed/host/logging/SessionEvent.java",
   "src/src/main/java/com/google/android/libraries/feed/host/logging/SpinnerType.java",
   "src/src/main/java/com/google/android/libraries/feed/host/logging/ZeroStateShowReason.java",
   "src/src/main/java/com/google/android/libraries/feed/host/network/HttpHeader.java",
@@ -288,6 +291,7 @@ feed_conformance_test_lib_sources = [
   "src/src/main/java/com/google/android/libraries/feed/api/common/testing/InternalProtocolBuilder.java",
   "src/src/main/java/com/google/android/libraries/feed/common/concurrent/testing/ClockBackedFakeMainThreadRunner.java",
   "src/src/main/java/com/google/android/libraries/feed/common/concurrent/testing/FakeMainThreadRunner.java",
+  "src/src/main/java/com/google/android/libraries/feed/common/testing/FakeBasicLoggingApi.java",
   "src/src/main/java/com/google/android/libraries/feed/common/testing/FakeRequestManager.java",
   "src/src/main/java/com/google/android/libraries/feed/common/testing/InfrastructureIntegrationScope.java",
   "src/src/main/java/com/google/android/libraries/feed/common/testing/ModelProviderValidator.java",