[Feed] Import feed@1160f3e7bcb05b8bda84edbb2c0f31395b230c3c

Monochrome.apk_Dex
        +2 entries fields
        +5 entries methods
        +1 entries types
        +1 entries strings
Monochrome.apk_Breakdown (+1,897 bytes)
      +145 bytes Zip Overhead
      +251 bytes Non-compiled Android resources size
       +17 bytes Package metadata size
       -20 bytes Java code size
    +1,504 bytes Compiled Android resources size
Monochrome.apk_Specifics
    +2,289 bytes normalized apk size
        +1 zip entries file count
      +392 bytes main dex size

Change-Id: Ia465e1ee3a2b9c411feb4265ab18ef05d3674d7f
Reviewed-on: https://chromium-review.googlesource.com/1033453
Reviewed-by: Sky Malice <skym@chromium.org>
Commit-Queue: Filip Gorski <fgorski@chromium.org>
Cr-Commit-Position: refs/heads/master@{#554469}

DEPS

@@ -166,7 +166,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': 'a8ecfb5b2201743e69e4e2961571308975212ce2',
+  'feed_revision': '1160f3e7bcb05b8bda84edbb2c0f31395b230c3c',
   # 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/BUILD.gn

@@ -14,11 +14,18 @@ android_resources("piet_resources") {
   custom_package = "com.google.android.libraries.feed.piet"
 }
 
+android_resources("basicstream_resources") {
+  resource_dirs = [ "src/src/main/java/com/google/android/libraries/feed/basicstream/internal/viewholders/res" ]
+  custom_package =
+      "com.google.android.libraries.feed.basicstream.internal.viewholders"
+}
+
 android_library("feed_lib_java") {
   chromium_code = false
   java_files = feed_lib_java_sources
 
   deps = [
+    ":basicstream_resources",
     ":feed_lib_proto_java",
     ":piet_resources",
     "//third_party/android_tools:android_support_annotations_java",

third_party/feed/README.chromium

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

third_party/feed/java_sources.gni

@@ -26,7 +26,6 @@ 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/sessionmanager/SessionMutation.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/SemanticPropertiesMutation.java",
   "src/src/main/java/com/google/android/libraries/feed/api/store/SessionMutation.java",
@@ -38,13 +37,19 @@ feed_lib_java_sources = [
   "src/src/main/java/com/google/android/libraries/feed/basicstream/internal/StreamActionApiImpl.java",
   "src/src/main/java/com/google/android/libraries/feed/basicstream/internal/StreamRecyclerViewAdapter.java",
   "src/src/main/java/com/google/android/libraries/feed/basicstream/internal/contentmodels/ContentModel.java",
+  "src/src/main/java/com/google/android/libraries/feed/basicstream/internal/contentmodels/ContinuationContentModel.java",
   "src/src/main/java/com/google/android/libraries/feed/basicstream/internal/contentmodels/PietContentModel.java",
+  "src/src/main/java/com/google/android/libraries/feed/basicstream/internal/drivers/CardDriver.java",
+  "src/src/main/java/com/google/android/libraries/feed/basicstream/internal/drivers/ClusterDriver.java",
+  "src/src/main/java/com/google/android/libraries/feed/basicstream/internal/drivers/ContentDriver.java",
+  "src/src/main/java/com/google/android/libraries/feed/basicstream/internal/drivers/ContinuationDriver.java",
+  "src/src/main/java/com/google/android/libraries/feed/basicstream/internal/drivers/FeatureDriver.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/piet/PietAssetProvider.java",
   "src/src/main/java/com/google/android/libraries/feed/basicstream/internal/piet/PietCustomElementProvider.java",
   "src/src/main/java/com/google/android/libraries/feed/basicstream/internal/piet/PietHostBindingProvider.java",
-  "src/src/main/java/com/google/android/libraries/feed/basicstream/internal/piet/PietSharedStateSupplier.java",
   "src/src/main/java/com/google/android/libraries/feed/basicstream/internal/util/TokenHandler.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/PietViewHolder.java",
   "src/src/main/java/com/google/android/libraries/feed/basicstream/internal/viewholders/ViewHolderType.java",
   "src/src/main/java/com/google/android/libraries/feed/common/Result.java",
@@ -86,7 +91,6 @@ feed_lib_java_sources = [
   "src/src/main/java/com/google/android/libraries/feed/feedsessionmanager/internal/Session.java",
   "src/src/main/java/com/google/android/libraries/feed/feedsessionmanager/internal/SessionFactory.java",
   "src/src/main/java/com/google/android/libraries/feed/feedsessionmanager/internal/SessionImpl.java",
-  "src/src/main/java/com/google/android/libraries/feed/feedsessionmanager/internal/SessionMutationImpl.java",
   "src/src/main/java/com/google/android/libraries/feed/feedstore/ContentGc.java",
   "src/src/main/java/com/google/android/libraries/feed/feedstore/FeedStore.java",
   "src/src/main/java/com/google/android/libraries/feed/feedstore/internal/FeedContentMutation.java",
@@ -99,6 +103,7 @@ feed_lib_java_sources = [
   "src/src/main/java/com/google/android/libraries/feed/host/config/DebugBehavior.java",
   "src/src/main/java/com/google/android/libraries/feed/host/imageloader/ImageLoaderApi.java",
   "src/src/main/java/com/google/android/libraries/feed/host/logging/LoggingApi.java",
+  "src/src/main/java/com/google/android/libraries/feed/host/network/HttpHeader.java",
   "src/src/main/java/com/google/android/libraries/feed/host/network/HttpRequest.java",
   "src/src/main/java/com/google/android/libraries/feed/host/network/HttpResponse.java",
   "src/src/main/java/com/google/android/libraries/feed/host/network/NetworkClient.java",
@@ -120,6 +125,7 @@ feed_lib_java_sources = [
   "src/src/main/java/com/google/android/libraries/feed/hostimpl/storage/InMemoryJournalStorage.java",
   "src/src/main/java/com/google/android/libraries/feed/hostimpl/storage/PersistentContentStorage.java",
   "src/src/main/java/com/google/android/libraries/feed/hostimpl/storage/PersistentJournalStorage.java",
+  "src/src/main/java/com/google/android/libraries/feed/mocknetworkclient/MockPushServer.java",
   "src/src/main/java/com/google/android/libraries/feed/mocknetworkclient/MockServerNetworkClient.java",
   "src/src/main/java/com/google/android/libraries/feed/piet/AdapterFactory.java",
   "src/src/main/java/com/google/android/libraries/feed/piet/AdapterParameters.java",
@@ -132,7 +138,6 @@ feed_lib_java_sources = [
   "src/src/main/java/com/google/android/libraries/feed/piet/ElementListAdapter.java",
   "src/src/main/java/com/google/android/libraries/feed/piet/FrameAdapter.java",
   "src/src/main/java/com/google/android/libraries/feed/piet/FrameContext.java",
-  "src/src/main/java/com/google/android/libraries/feed/piet/FrameModelBinder.java",
   "src/src/main/java/com/google/android/libraries/feed/piet/GridRowAdapter.java",
   "src/src/main/java/com/google/android/libraries/feed/piet/ImageElementAdapter.java",
   "src/src/main/java/com/google/android/libraries/feed/piet/KeyedRecyclerPool.java",

third_party/feed/proto_sources.gni

@@ -21,6 +21,7 @@ feed_lib_proto_sources = [
   "src/src/main/proto/search/now/proto/ui/piet/styles.proto",
   "src/src/main/proto/search/now/proto/ui/piet/text.proto",
   "src/src/main/proto/search/now/proto/ui/stream/stream_structure.proto",
+  "src/src/main/proto/search/now/proto/wire/feed/action_type.proto",
   "src/src/main/proto/search/now/proto/wire/feed/client_info.proto",
   "src/src/main/proto/search/now/proto/wire/feed/content_id.proto",
   "src/src/main/proto/search/now/proto/wire/feed/data_operation.proto",