Adjust disabled features.

Added:
 * kAppDiscoveryRemoteUrlSearch

Removed:
 * kLangClientHintHeader - we disable all hint headers, so there is no
   need to disable this one individually. Also adjusted hint headers
   browser test to test for viewport-height hint.

Reordered disabled tests alphabetically regardless of platforms.

app/brave_main_delegate.cc

@@ -61,6 +61,7 @@
 #include "brave/build/android/jni_headers/BraveQAPreferences_jni.h"
 #include "components/signin/public/base/account_consistency_method.h"
 #else
+#include "chrome/browser/apps/app_discovery_service/app_discovery_features.h"
 #include "chrome/browser/browser_features.h"
 #include "chrome/browser/ui/profile_picker.h"
 #endif
@@ -228,6 +229,9 @@ bool BraveMainDelegate::BasicStartupComplete(int* exit_code) {
 
   // Disabled features.
   std::unordered_set<const char*> disabled_features = {
+#if !defined(OS_ANDROID)
+    apps::kAppDiscoveryRemoteUrlSearch.name,
+#endif
     autofill::features::kAutofillEnableAccountWalletStorage.name,
     autofill::features::kAutofillServerCommunication.name,
     blink::features::kConversionMeasurement.name,
@@ -236,7 +240,6 @@ bool BraveMainDelegate::BasicStartupComplete(int* exit_code) {
     blink::features::kHandwritingRecognitionWebPlatformApiFinch.name,
     blink::features::kInterestCohortAPIOriginTrial.name,
     blink::features::kInterestCohortFeaturePolicy.name,
-    blink::features::kLangClientHintHeader.name,
     blink::features::kNavigatorPluginsFixed.name,
     blink::features::kTextFragmentAnchor.name,
 #if !defined(OS_ANDROID)
@@ -249,20 +252,26 @@ bool BraveMainDelegate::BasicStartupComplete(int* exit_code) {
     features::kSignedExchangePrefetchCacheForNavigations.name,
     features::kSignedExchangeSubresourcePrefetch.name,
     features::kSubresourceWebBundles.name,
+#if defined(OS_ANDROID)
+    features::kWebNfc.name,
+#endif
     features::kWebOTP.name,
     features::kTabGroupsFeedback.name,
     federated_learning::kFederatedLearningOfCohorts.name,
     federated_learning::kFlocIdComputedEventLogging.name,
+#if defined(OS_ANDROID)
+    feed::kInterestFeedContentSuggestions.name,
+    feed::kInterestFeedV2.name,
+#endif
     media::kLiveCaption.name,
     net::features::kFirstPartySets.name,
     network::features::kTrustTokens.name,
     network_time::kNetworkTimeServiceQuerying.name,
+#if defined(OS_ANDROID)
+    offline_pages::kPrefetchingOfflinePagesFeature.name,
+#endif
     reading_list::switches::kReadLater.name,
 #if defined(OS_ANDROID)
-    features::kWebNfc.name,
-    feed::kInterestFeedContentSuggestions.name,
-    feed::kInterestFeedV2.name,
-    offline_pages::kPrefetchingOfflinePagesFeature.name,
     translate::kTranslate.name,
 #endif
   };

app/brave_main_delegate_browsertest.cc

@@ -32,6 +32,7 @@
 #if defined(OS_ANDROID)
 #include "chrome/test/base/android/android_browser_test.h"
 #else
+#include "chrome/browser/apps/app_discovery_service/app_discovery_features.h"
 #include "chrome/browser/browser_features.h"
 #include "chrome/browser/ui/profile_picker.h"
 #include "chrome/browser/ui/ui_features.h"
@@ -81,6 +82,9 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, OriginTrialsTest) {
 
 IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) {
   const base::Feature* disabled_features[] = {
+#if !defined(OS_ANDROID)
+    &apps::kAppDiscoveryRemoteUrlSearch,
+#endif
     &autofill::features::kAutofillEnableAccountWalletStorage,
     &autofill::features::kAutofillServerCommunication,
     &blink::features::kConversionMeasurement,
@@ -89,7 +93,6 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) {
     &blink::features::kHandwritingRecognitionWebPlatformApiFinch,
     &blink::features::kInterestCohortAPIOriginTrial,
     &blink::features::kInterestCohortFeaturePolicy,
-    &blink::features::kLangClientHintHeader,
     &blink::features::kNavigatorPluginsFixed,
     &blink::features::kTextFragmentAnchor,
 #if !defined(OS_ANDROID)

chromium_src/third_party/blink/public/platform/disable_client_hints_browsertest.cc

@@ -22,7 +22,13 @@
 #include "third_party/blink/public/common/client_hints/client_hints.h"
 #include "third_party/blink/public/common/features.h"
 
+namespace {
 const char kClientHints[] = "/ch.html";
+const std::vector<base::Feature> kTestFeatures = {
+    blink::features::kLangClientHintHeader,
+    blink::features::kViewportHeightClientHintHeader,
+};
+}  // namespace
 
 class ClientHintsBrowserTest : public InProcessBrowserTest,
                                public ::testing::WithParamInterface<bool> {
@@ -46,17 +52,15 @@ class ClientHintsBrowserTest : public InProcessBrowserTest,
 
   ~ClientHintsBrowserTest() override {}
 
-  bool IsLangClientHintHeaderEnabled() { return GetParam(); }
+  bool IsClientHintHeaderEnabled() { return GetParam(); }
 
   void SetUp() override {
-    if (IsLangClientHintHeaderEnabled()) {
-      // Test that even with Lang CH feature enabled, there is no header.
-      scoped_feature_list_.InitAndEnableFeature(
-          blink::features::kLangClientHintHeader);
-    } else {
-      scoped_feature_list_.InitAndDisableFeature(
-          blink::features::kLangClientHintHeader);
-    }
+    // Test that even with Lang CH feature enabled, there is no header.
+    scoped_feature_list_.InitWithFeatures(
+        IsClientHintHeaderEnabled() ? kTestFeatures
+                                    : std::vector<base::Feature>(),
+        IsClientHintHeaderEnabled() ? std::vector<base::Feature>()
+                                    : kTestFeatures);
     InProcessBrowserTest::SetUp();
   }
 
@@ -92,9 +96,10 @@ class ClientHintsBrowserTest : public InProcessBrowserTest,
 };
 
 IN_PROC_BROWSER_TEST_P(ClientHintsBrowserTest, ClientHintsDisabled) {
-  EXPECT_EQ(
-      IsLangClientHintHeaderEnabled(),
-      base::FeatureList::IsEnabled(blink::features::kLangClientHintHeader));
+  for (const auto& feature : kTestFeatures) {
+    EXPECT_EQ(IsClientHintHeaderEnabled(),
+              base::FeatureList::IsEnabled(feature));
+  }
   ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), client_hints_url()));
   EXPECT_EQ(0u, count_client_hints_headers_seen());
 }

test/data/ch.html.mock-http-headers

@@ -1,2 +1,2 @@
 HTTP/1.1 200 OK
-Accept-CH: dpr,device-memory,viewport-width,rtt,downlink,ect,lang,ua,arch,platform,model
+Accept-CH: dpr,device-memory,viewport-height,viewport-width,rtt,downlink,ect,lang,ua,arch,platform,model