android: Remove feature flag for forcing 60Hz refresh rate.

This was added for Pixel 4 rollout, to have a kill switch in case
rendering at higher rates has any issues. The flag is not necessary
anymore.

R=boliu@chromium.org

Change-Id: I4dc804fee6ab162cd7dd0f5186c7f7faef41ed3d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2622520
Commit-Queue: Khushal <khushalsagar@chromium.org>
Commit-Queue: Avi Drissman <avi@chromium.org>
Reviewed-by: Avi Drissman <avi@chromium.org>
Reviewed-by: Bo <boliu@chromium.org>
Auto-Submit: Khushal <khushalsagar@chromium.org>
Cr-Commit-Position: refs/heads/master@{#842278}

content/browser/renderer_host/compositor_impl_android.cc

@@ -341,8 +341,6 @@ void CompositorImpl::SetRootWindow(gfx::NativeWindow root_window) {
   }
 
   root_window_ = root_window;
-  if (base::FeatureList::IsEnabled(features::kForce60HzRefreshRate))
-    root_window_->SetForce60HzRefreshRate();
   root_window_->SetLayer(root_layer ? root_layer : cc::Layer::Create());
   root_window_->GetLayer()->SetBounds(size_);
   root_window->AttachCompositor(this);

content/public/common/content_features.cc

@@ -877,10 +877,6 @@ const base::Feature kBackgroundMediaRendererHasModerateBinding{
     "BackgroundMediaRendererHasModerateBinding",
     base::FEATURE_DISABLED_BY_DEFAULT};
 
-// Force display to tick at ~60Hz refresh rate.
-const base::Feature kForce60HzRefreshRate{"Force60HzRefreshRate",
-                                          base::FEATURE_DISABLED_BY_DEFAULT};
-
 // Screen Capture API support for Android
 const base::Feature kUserMediaScreenCapturing{
     "UserMediaScreenCapturing", base::FEATURE_DISABLED_BY_DEFAULT};

content/public/common/content_features.h

@@ -201,7 +201,6 @@ CONTENT_EXPORT extern const base::Feature kWebXrIncubations;
 CONTENT_EXPORT extern const base::Feature kAndroidAutofillAccessibility;
 CONTENT_EXPORT extern const base::Feature
     kBackgroundMediaRendererHasModerateBinding;
-CONTENT_EXPORT extern const base::Feature kForce60HzRefreshRate;
 CONTENT_EXPORT extern const base::Feature kUserMediaScreenCapturing;
 CONTENT_EXPORT extern const base::Feature kWarmUpNetworkProcess;
 CONTENT_EXPORT extern const base::Feature kWebNfc;

ui/android/window_android.cc

@@ -147,9 +147,6 @@ std::vector<float> WindowAndroid::GetSupportedRefreshRates() {
 }
 
 void WindowAndroid::SetPreferredRefreshRate(float refresh_rate) {
-  if (force_60hz_refresh_rate_)
-    return;
-
   if (test_hooks_) {
     test_hooks_->SetPreferredRate(refresh_rate);
     return;
@@ -204,7 +201,6 @@ void WindowAndroid::OnUpdateRefreshRate(
     float refresh_rate) {
   if (compositor_)
     compositor_->OnUpdateRefreshRate(refresh_rate);
-  Force60HzRefreshRateIfNeeded();
 }
 
 void WindowAndroid::OnSupportedRefreshRatesUpdated(
@@ -218,8 +214,6 @@ void WindowAndroid::OnSupportedRefreshRatesUpdated(
   }
   if (compositor_)
     compositor_->OnUpdateSupportedRefreshRates(supported_refresh_rates);
-
-  Force60HzRefreshRateIfNeeded();
 }
 
 void WindowAndroid::SetWideColorEnabled(bool enabled) {
@@ -227,22 +221,6 @@ void WindowAndroid::SetWideColorEnabled(bool enabled) {
   Java_WindowAndroid_setWideColorEnabled(env, GetJavaObject(), enabled);
 }
 
-void WindowAndroid::SetForce60HzRefreshRate() {
-  if (force_60hz_refresh_rate_)
-    return;
-
-  force_60hz_refresh_rate_ = true;
-  Force60HzRefreshRateIfNeeded();
-}
-
-void WindowAndroid::Force60HzRefreshRateIfNeeded() {
-  if (!force_60hz_refresh_rate_)
-    return;
-
-  JNIEnv* env = AttachCurrentThread();
-  Java_WindowAndroid_setPreferredRefreshRate(env, GetJavaObject(), 60.f);
-}
-
 bool WindowAndroid::HasPermission(const std::string& permission) {
   JNIEnv* env = AttachCurrentThread();
   return Java_WindowAndroid_hasPermission(

ui/android/window_android.h

@@ -104,8 +104,6 @@ class UI_ANDROID_EXPORT WindowAndroid : public ViewAndroid {
 
   void SetWideColorEnabled(bool enabled);
 
-  void SetForce60HzRefreshRate();
-
   class TestHooks {
    public:
     virtual ~TestHooks() = default;
@@ -148,7 +146,6 @@ class UI_ANDROID_EXPORT WindowAndroid : public ViewAndroid {
   bool vsync_paused_ = false;
 
   TestHooks* test_hooks_ = nullptr;
-  bool force_60hz_refresh_rate_ = false;
 
   int selection_handles_active_count_ = 0;