[Feed] Import feed@84617ef81ded68396acf495e8392266950972223

Specifics:
       +66,376 bytes main lib size
      +488,684 bytes main dex size
      +786,246 bytes normalized apk size
InstallSize:
      +300,364 bytes APK size
      +872,125 bytes Estimated installed size (Android Go)
    +2,274,647 bytes Estimated installed size
InstallBreakdown (+2,274,662 bytes):
        +2,802 bytes unwind_cfi (dev and canary only) size
        +2,708 bytes Non-compiled Android resources size
       +66,376 bytes Native code size
          +552 bytes Package metadata size
    +2,185,868 bytes Java code size
       +16,356 bytes Compiled Android resources size
Dex:
        +2,495 entries fields
        +3,526 entries methods
          +802 entries types
        +1,766 entries strings

Bug: 913874
Change-Id: Icda58273a358ec07b86f6ac2cbd2350a43870ffb
Reviewed-on: https://chromium-review.googlesource.com/c/1393261Reviewed-by: Filip Gorski <fgorski@chromium.org>
Commit-Queue: Sky Malice <skym@chromium.org>
Cr-Commit-Position: refs/heads/master@{#619464}

DEPS

@@ -197,7 +197,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': 'e2809cef2bf967cf572527e0944307fd2a9277d0',
+  'feed_revision': '84617ef81ded68396acf495e8392266950972223',
   # 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.

third_party/feed/README.chromium

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

third_party/feed/java_sources.gni

@@ -18,6 +18,7 @@ feed_lib_java_sources = [
   "src/src/main/java/com/google/android/libraries/feed/api/knowncontent/ContentRemoval.java",
   "src/src/main/java/com/google/android/libraries/feed/api/knowncontent/KnownContentApi.java",
   "src/src/main/java/com/google/android/libraries/feed/api/lifecycle/AppLifecycleListener.java",
+  "src/src/main/java/com/google/android/libraries/feed/api/lifecycle/Resettable.java",
   "src/src/main/java/com/google/android/libraries/feed/api/modelprovider/FeatureChange.java",
   "src/src/main/java/com/google/android/libraries/feed/api/modelprovider/FeatureChangeObserver.java",
   "src/src/main/java/com/google/android/libraries/feed/api/modelprovider/ModelChild.java",
@@ -34,6 +35,7 @@ feed_lib_java_sources = [
   "src/src/main/java/com/google/android/libraries/feed/api/modelprovider/TokenCompletedObserver.java",
   "src/src/main/java/com/google/android/libraries/feed/api/protocoladapter/ProtocolAdapter.java",
   "src/src/main/java/com/google/android/libraries/feed/api/requestmanager/RequestManager.java",
+  "src/src/main/java/com/google/android/libraries/feed/api/scope/ClearAllListener.java",
   "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",
@@ -64,12 +66,6 @@ feed_lib_java_sources = [
   "src/src/main/java/com/google/android/libraries/feed/basicstream/internal/drivers/NoContentDriver.java",
   "src/src/main/java/com/google/android/libraries/feed/basicstream/internal/drivers/StreamDriver.java",
   "src/src/main/java/com/google/android/libraries/feed/basicstream/internal/drivers/ZeroStateDriver.java",
-  "src/src/main/java/com/google/android/libraries/feed/basicstream/internal/logging/LoggingListener.java",
-  "src/src/main/java/com/google/android/libraries/feed/basicstream/internal/logging/OneShotVisibilityLoggingListener.java",
-  "src/src/main/java/com/google/android/libraries/feed/basicstream/internal/logging/SpinnerLogger.java",
-  "src/src/main/java/com/google/android/libraries/feed/basicstream/internal/logging/StreamContentLoggingData.java",
-  "src/src/main/java/com/google/android/libraries/feed/basicstream/internal/logging/VisibilityListener.java",
-  "src/src/main/java/com/google/android/libraries/feed/basicstream/internal/logging/VisibilityMonitor.java",
   "src/src/main/java/com/google/android/libraries/feed/basicstream/internal/scroll/ScrollRestorer.java",
   "src/src/main/java/com/google/android/libraries/feed/basicstream/internal/viewholders/ContinuationViewHolder.java",
   "src/src/main/java/com/google/android/libraries/feed/basicstream/internal/viewholders/FeedViewHolder.java",
@@ -91,7 +87,6 @@ feed_lib_java_sources = [
   "src/src/main/java/com/google/android/libraries/feed/common/functional/Consumer.java",
   "src/src/main/java/com/google/android/libraries/feed/common/functional/Function.java",
   "src/src/main/java/com/google/android/libraries/feed/common/functional/Predicate.java",
-  "src/src/main/java/com/google/android/libraries/feed/common/functional/SettableSupplier.java",
   "src/src/main/java/com/google/android/libraries/feed/common/functional/Supplier.java",
   "src/src/main/java/com/google/android/libraries/feed/common/locale/LocaleUtils.java",
   "src/src/main/java/com/google/android/libraries/feed/common/logging/Dumpable.java",
@@ -237,13 +232,18 @@ feed_lib_java_sources = [
   "src/src/main/java/com/google/android/libraries/feed/piet/host/HostBindingProvider.java",
   "src/src/main/java/com/google/android/libraries/feed/piet/ui/AspectRatioScalingImageView.java",
   "src/src/main/java/com/google/android/libraries/feed/piet/ui/BorderDrawable.java",
-  "src/src/main/java/com/google/android/libraries/feed/piet/ui/DrawableScalingHelper.java",
   "src/src/main/java/com/google/android/libraries/feed/piet/ui/GridRowView.java",
   "src/src/main/java/com/google/android/libraries/feed/piet/ui/RoundedCornerViewHelper.java",
   "src/src/main/java/com/google/android/libraries/feed/piet/ui/RoundedCornerWrapperView.java",
   "src/src/main/java/com/google/android/libraries/feed/sharedstream/contentchanged/StreamContentChangedListener.java",
   "src/src/main/java/com/google/android/libraries/feed/sharedstream/contextmenumanager/ContextMenuManager.java",
   "src/src/main/java/com/google/android/libraries/feed/sharedstream/contextmenumanager/ContextMenuManagerImpl.java",
+  "src/src/main/java/com/google/android/libraries/feed/sharedstream/logging/LoggingListener.java",
+  "src/src/main/java/com/google/android/libraries/feed/sharedstream/logging/OneShotVisibilityLoggingListener.java",
+  "src/src/main/java/com/google/android/libraries/feed/sharedstream/logging/SpinnerLogger.java",
+  "src/src/main/java/com/google/android/libraries/feed/sharedstream/logging/StreamContentLoggingData.java",
+  "src/src/main/java/com/google/android/libraries/feed/sharedstream/logging/VisibilityListener.java",
+  "src/src/main/java/com/google/android/libraries/feed/sharedstream/logging/VisibilityMonitor.java",
   "src/src/main/java/com/google/android/libraries/feed/sharedstream/offlinemonitor/StreamOfflineMonitor.java",
   "src/src/main/java/com/google/android/libraries/feed/sharedstream/piet/PietAssetProvider.java",
   "src/src/main/java/com/google/android/libraries/feed/sharedstream/piet/PietCustomElementProvider.java",
@@ -258,6 +258,7 @@ feed_lib_java_sources = [
 feed_conformance_test_lib_sources = [
   "src/src/main/java/com/google/android/libraries/feed/api/common/testing/ContentIdGenerators.java",
   "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/FakeMainThreadRunner.java",
   "src/src/main/java/com/google/android/libraries/feed/common/testing/FakeClock.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",

third_party/feed/update_java_sources.sh

@@ -24,7 +24,7 @@ echo "]
 " >> java_sources.gni
 
 echo "feed_conformance_test_lib_sources = [" >> java_sources.gni
-find src/src/main/java/com/google/android/libraries/feed -wholename "*/common/testing/*.java" |\
+find src/src/main/java/com/google/android/libraries/feed -regex ".*/common/\(.*/\)*testing/.*\.java" |\
     env LC_COLLATE=en_US.ASCII sort | sed 's/^\(.*\)$/  "\1",/g' >> java_sources.gni
 find src/src/main/java/com/google/android/libraries/feed/testing/conformance -wholename "*.java" |\
     env LC_COLLATE=en_US.ASCII sort | sed 's/^\(.*\)$/  "\1",/g' >> java_sources.gni