[M103][Crow] Add crow capability to feed request.

(cherry picked from commit abf7d0f) Bug: 1321709 Change-Id: Ibd8a601d22e830e362fcd4e34168c3d605f91065 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3636865 Reviewed-by: Colin Blundell <blundell@chromium.org> Reviewed-by: Dan H <harringtond@chromium.org> Reviewed-by: Travis Skare <skare@chromium.org> Commit-Queue: Sophey Dong <sophey@chromium.org> Cr-Original-Commit-Position: refs/heads/main@{#1003036} Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3687981 Reviewed-by: David Trainor <dtrainor@chromium.org> Commit-Queue: Krishna Govind <govind@chromium.org> Cr-Commit-Position: refs/branch-heads/5060@{#648} Cr-Branched-From: b83393d-refs/heads/main@{#1002911}
chromium · Jun 7, 2022 · 471e7eb · 471e7eb
1 parent d5491a6
commit 471e7eb
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 6 deletions.
diff --git a/chrome/browser/component_updater/DEPS b/chrome/browser/component_updater/DEPS
@@ -4,6 +4,7 @@ include_rules = [
   "+chrome/browser/share",
   "+chrome/updater",
   "+components/cdm/common",
+  "+components/feed",
   "+components/live_caption",
   "+components/soda",
   "+media/cdm",

diff --git a/chrome/browser/component_updater/crow_domain_list_component_installer.cc b/chrome/browser/component_updater/crow_domain_list_component_installer.cc
@@ -23,6 +23,7 @@
 #include "chrome/browser/flags/android/chrome_feature_list.h"
 #include "components/component_updater/component_installer.h"
 #include "components/component_updater/component_updater_paths.h"
+#include "components/feed/feed_feature_list.h"
 
 using component_updater::ComponentUpdateService;
 
@@ -125,7 +126,7 @@ CrowDomainListComponentInstallerPolicy::GetInstallerAttributes() const {
 }
 
 void RegisterCrowDomainListComponent(ComponentUpdateService* cus) {
-  if (!base::FeatureList::IsEnabled(chrome::android::kShareCrowButton)) {
+  if (!base::FeatureList::IsEnabled(feed::kShareCrowButton)) {
     return;
   }
 

diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
@@ -148,6 +148,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
     &feed::kInterestFeedV2,
     &feed::kInterestFeedV2Autoplay,
     &feed::kInterestFeedV2Hearts,
+    &feed::kShareCrowButton,
     &feed::kReliabilityLogging,
     &feed::kWebFeed,
     &feed::kWebFeedAwareness,
@@ -267,7 +268,6 @@ const base::Feature* const kFeaturesExposedToJava[] = {
     &kServiceManagerForBackgroundPrefetch,
     &kServiceManagerForDownload,
     &kShareButtonInTopToolbar,
-    &kShareCrowButton,
     &kSharedClipboardUI,
     &kShowScrollableMVTOnNTPAndroid,
     &kSpannableInlineAutocomplete,
@@ -741,9 +741,6 @@ const base::Feature kServiceManagerForDownload{
 const base::Feature kShareButtonInTopToolbar{"ShareButtonInTopToolbar",
                                              base::FEATURE_DISABLED_BY_DEFAULT};
 
-const base::Feature kShareCrowButton{"ShareCrowButton",
-                                     base::FEATURE_DISABLED_BY_DEFAULT};
-
 const base::Feature kShowScrollableMVTOnNTPAndroid{
     "ShowScrollableMVTOnNTPAndroid", base::FEATURE_DISABLED_BY_DEFAULT};
 

diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h
@@ -131,7 +131,6 @@ extern const base::Feature kSearchEnginePromoNewDeviceV2;
 extern const base::Feature kServiceManagerForBackgroundPrefetch;
 extern const base::Feature kServiceManagerForDownload;
 extern const base::Feature kShareButtonInTopToolbar;
-extern const base::Feature kShareCrowButton;
 extern const base::Feature kSharingHubLinkToggle;
 extern const base::Feature kShowScrollableMVTOnNTPAndroid;
 extern const base::Feature kSpannableInlineAutocomplete;

diff --git a/components/feed/core/v2/proto_util.cc b/components/feed/core/v2/proto_util.cc
@@ -162,6 +162,13 @@ feedwire::Request CreateFeedQueryRequest(
     feed_request.add_client_capability(Capability::DOWNLOAD_LINK);
   }
 
+#if BUILDFLAG(IS_ANDROID)
+  // Note that the Crow feature is referenced as THANK_CREATOR within the feed.
+  if (base::FeatureList::IsEnabled(kShareCrowButton)) {
+    feed_request.add_client_capability(Capability::THANK_CREATOR);
+  }
+#endif
+
   if (base::FeatureList::IsEnabled(kPersonalizeFeedUnsignedUsers)) {
     feed_request.add_client_capability(Capability::ON_DEVICE_USER_PROFILE);
   }

diff --git a/components/feed/core/v2/proto_util_unittest.cc b/components/feed/core/v2/proto_util_unittest.cc
@@ -283,6 +283,22 @@ TEST(ProtoUtilTest, ReadLaterDisabled) {
               Not(Contains((feedwire::Capability::READ_LATER))));
 }
 
+#if BUILDFLAG(IS_ANDROID)
+TEST(ProtoUtilTest, CrowButtonEnabled) {
+  base::test::ScopedFeatureList scoped_feature_list;
+  scoped_feature_list.InitWithFeatures({kShareCrowButton}, {});
+  feedwire::FeedRequest request =
+      CreateFeedQueryRefreshRequest(kForYouStream,
+                                    feedwire::FeedQuery::MANUAL_REFRESH,
+                                    /*request_metadata=*/{},
+                                    /*consistency_token=*/std::string())
+          .feed_request();
+
+  ASSERT_THAT(request.client_capability(),
+              Contains(feedwire::Capability::THANK_CREATOR));
+}
+#endif  // BUILDFLAG(IS_ANDROID)
+
 TEST(ProtoUtilTest, InfoCardAcknowledgementTrackingEnabled) {
   base::test::ScopedFeatureList scoped_feature_list;
   scoped_feature_list.InitWithFeatures({kInfoCardAcknowledgementTracking}, {});

diff --git a/components/feed/feed_feature_list.cc b/components/feed/feed_feature_list.cc
@@ -113,6 +113,9 @@ const base::Feature kPersonalizeFeedUnsignedUsers{
 const base::Feature kInfoCardAcknowledgementTracking{
     "InfoCardAcknowledgementTracking", base::FEATURE_DISABLED_BY_DEFAULT};
 
+const base::Feature kShareCrowButton{"ShareCrowButton",
+                                     base::FEATURE_DISABLED_BY_DEFAULT};
+
 const base::Feature kIsAblated{"FeedAblation",
                                base::FEATURE_DISABLED_BY_DEFAULT};
 }  // namespace feed
diff --git a/components/feed/feed_feature_list.h b/components/feed/feed_feature_list.h
@@ -111,6 +111,11 @@ extern const base::Feature kPersonalizeFeedUnsignedUsers;
 // Feature that enables tracking the acknowledgement state for the info cards.
 extern const base::Feature kInfoCardAcknowledgementTracking;
 
+// Feature that enables the Crow feature.
+// Owned by the CwF team but located here until it makes sense to create a crow
+// component, since it is being used in the feed component.
+extern const base::Feature kShareCrowButton;
+
 // Feature that when enabled completely removes all Feeds from chrome.
 extern const base::Feature kIsAblated;