Adding a flag that enables both context menu badging and hint fetching.

This change also removes the former flag from chrome://flags. The
underlying Feature is still necessary for experiments.

Bug: 1040661
Change-Id: I91480f2b47351f021421f0d151df6c6d5a58f35e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2276612
Commit-Queue: Josh Simmons <[email protected]>
Reviewed-by: Sophie Chang <[email protected]>
Reviewed-by: David Trainor <[email protected]>
Reviewed-by: Megan Jablonski <[email protected]>
Cr-Commit-Position: refs/heads/master@{#785488}
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index acf6a86..284f25b 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -37,6 +37,7 @@
 #include "chrome/browser/net/stub_resolver_config_reader.h"
 #include "chrome/browser/net/system_network_context_manager.h"
 #include "chrome/browser/notifications/scheduler/public/features.h"
+#include "chrome/browser/performance_hints/performance_hints_features.h"
 #include "chrome/browser/performance_manager/policies/policy_features.h"
 #include "chrome/browser/permissions/quiet_notification_permission_ui_config.h"
 #include "chrome/browser/predictors/loading_predictor_config.h"
@@ -5553,17 +5554,19 @@
                                     kPasswordChangeFeatureVariations,
                                     "PasswordChangeFeatureVariations.")},
 
-    {"context-menu-performance-info",
-     flag_descriptions::kContextMenuPerformanceInfoName,
-     flag_descriptions::kContextMenuPerformanceInfoDescription, kOsAndroid,
-     FEATURE_VALUE_TYPE(chrome::android::kContextMenuPerformanceInfo)},
+    {"context-menu-performance-info-and-remote-hints-fetching",
+     flag_descriptions::kContextMenuPerformanceInfoAndRemoteHintFetchingName,
+     flag_descriptions::
+         kContextMenuPerformanceInfoAndRemoteHintFetchingDescription,
+     kOsAndroid,
+     FEATURE_VALUE_TYPE(kContextMenuPerformanceInfoAndRemoteHintFetching)},
 #endif  // !defined(OS_ANDROID)
 
 #if defined(OS_ANDROID)
     {"page-info-performance-hints",
      flag_descriptions::kPageInfoPerformanceHintsName,
      flag_descriptions::kPageInfoPerformanceHintsDescription, kOsAndroid,
-     FEATURE_VALUE_TYPE(chrome::android::kPageInfoPerformanceHints)},
+     FEATURE_VALUE_TYPE(kPageInfoPerformanceHints)},
 #endif  // !defined(OS_ANDROID)
 
 #if defined(OS_ANDROID)