[CrOS Network] Delete QuickSettingNetworkRevamp feature flag

This CL continues the process of removing QuickSettingNetworkRevamp
feature flag. It deletes the flag and removes all referencfes of the
flag.

Bug: b/241028772
Test: Ran cq, and deployed to DUT
Change-Id: I5390fddc355159dceebf018144e0e3828282fc23
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4189358
Reviewed-by: Chad Duffin <chadduffin@chromium.org>
Commit-Queue: Theo Johnson-kanu <tjohnsonkanu@google.com>
Cr-Commit-Position: refs/heads/main@{#1096397}

ash/constants/ash_features.cc

@@ -1762,12 +1762,6 @@ BASE_FEATURE(kVCPortraitRelighting,
              "VCPortraitRelighting",
              base::FEATURE_DISABLED_BY_DEFAULT);
 
-// Enables or disables the Quick Settings Network revamp, which updates Network
-// Quick Settings UI and related infrastructure. See https://crbug.com/1169479.
-BASE_FEATURE(kQuickSettingsNetworkRevamp,
-             "QuickSettingsNetworkRevamp",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-
 // Enables or disables fingerprint quick unlock.
 BASE_FEATURE(kQuickUnlockFingerprint,
              "QuickUnlockFingerprint",

ash/constants/ash_features.h

@@ -503,8 +503,6 @@ COMPONENT_EXPORT(ASH_CONSTANTS) BASE_DECLARE_FEATURE(kQuickDim);
 COMPONENT_EXPORT(ASH_CONSTANTS) BASE_DECLARE_FEATURE(kVCBackgroundBlur);
 COMPONENT_EXPORT(ASH_CONSTANTS) BASE_DECLARE_FEATURE(kVCBackgroundReplace);
 COMPONENT_EXPORT(ASH_CONSTANTS) BASE_DECLARE_FEATURE(kVCPortraitRelighting);
-COMPONENT_EXPORT(ASH_CONSTANTS)
-BASE_DECLARE_FEATURE(kQuickSettingsNetworkRevamp);
 COMPONENT_EXPORT(ASH_CONSTANTS) BASE_DECLARE_FEATURE(kQuickUnlockFingerprint);
 COMPONENT_EXPORT(ASH_CONSTANTS) BASE_DECLARE_FEATURE(kQuickUnlockPinAutosubmit);
 // TODO(crbug.com/1104164) - Remove this once most users have their preferences

ash/system/network/network_detailed_network_view_unittest.cc

@@ -6,7 +6,6 @@
 
 #include <memory>
 
-#include "ash/constants/ash_features.h"
 #include "ash/system/network/network_detailed_network_view.h"
 #include "ash/system/network/network_detailed_view.h"
 #include "ash/system/network/network_list_mobile_header_view.h"
@@ -16,7 +15,6 @@
 #include "ash/system/tray/detailed_view_delegate.h"
 #include "ash/test/ash_test_base.h"
 #include "base/test/metrics/histogram_tester.h"
-#include "base/test/scoped_feature_list.h"
 #include "chromeos/ash/services/network_config/public/cpp/cros_network_config_test_helper.h"
 #include "chromeos/services/network_config/public/mojom/cros_network_config.mojom.h"
 #include "chromeos/services/network_config/public/mojom/network_types.mojom-shared.h"
@@ -101,8 +99,6 @@ class NetworkDetailedNetworkViewTest : public AshTestBase {
   void SetUp() override {
     AshTestBase::SetUp();
 
-    feature_list_.InitAndEnableFeature(features::kQuickSettingsNetworkRevamp);
-
     network_state_helper()->ClearDevices();
 
     network_state_helper()->manager_test()->AddTechnology(shill::kTypeCellular,
@@ -207,7 +203,6 @@ class NetworkDetailedNetworkViewTest : public AshTestBase {
     return &network_config_helper_.network_state_helper();
   }
 
-  base::test::ScopedFeatureList feature_list_;
   std::unique_ptr<views::Widget> widget_;
   CrosNetworkConfigTestHelper network_config_helper_;
   FakeNetworkDetailedNetworkViewDelegate fake_network_detailed_network_delagte_;

ash/system/network/network_detailed_view_controller_unittest.cc

@@ -6,7 +6,6 @@
 
 #include <memory>
 
-#include "ash/constants/ash_features.h"
 #include "ash/public/cpp/test/test_system_tray_client.h"
 #include "ash/shell.h"
 #include "ash/system/network/network_utils.h"
@@ -15,7 +14,6 @@
 #include "base/strings/strcat.h"
 #include "base/test/metrics/histogram_tester.h"
 #include "base/test/metrics/user_action_tester.h"
-#include "base/test/scoped_feature_list.h"
 #include "chromeos/ash/components/network/network_connect.h"
 #include "chromeos/ash/components/network/network_handler.h"
 #include "chromeos/ash/components/network/network_state_handler.h"
@@ -111,8 +109,6 @@ class NetworkDetailedViewControllerTest : public AshTestBase {
     NetworkConnect::Initialize(network_connect_delegate_.get());
     AshTestBase::SetUp();
 
-    feature_list_.InitAndEnableFeature(features::kQuickSettingsNetworkRevamp);
-
     network_detailed_view_controller_ =
         std::make_unique<NetworkDetailedViewController>(
             /*tray_controller=*/nullptr);
@@ -249,7 +245,6 @@ class NetworkDetailedViewControllerTest : public AshTestBase {
   const std::string& portal_signin_guid() const {
     return network_connect_delegate_->portal_signin_guid();
   }
-  base::test::ScopedFeatureList feature_list_;
 
  private:
   NetworkStateHandler* network_state_handler() {
@@ -611,11 +606,6 @@ TEST_F(NetworkDetailedViewControllerTest, MobileToggleClicked) {
 
 TEST_F(NetworkDetailedViewControllerTest,
        PortalNetworkListItemSelectedWithFlagEnabled) {
-  feature_list_.Reset();
-  feature_list_.InitWithFeatures(
-      /*enabled_features=*/{features::kQuickSettingsNetworkRevamp},
-      /*disabled_features=*/{});
-
   AddWifiService(shill::kStateRedirectFound);
 
   NetworkStatePropertiesPtr wifi_network = CreateStandaloneNetworkProperties(

ash/system/network/network_detailed_view_unittest.cc

@@ -6,7 +6,6 @@
 
 #include <memory>
 
-#include "ash/constants/ash_features.h"
 #include "ash/login_status.h"
 #include "ash/public/cpp/test/test_system_tray_client.h"
 #include "ash/strings/grit/ash_strings.h"
@@ -19,7 +18,6 @@
 #include "ash/test/ash_test_base.h"
 #include "base/run_loop.h"
 #include "base/test/metrics/user_action_tester.h"
-#include "base/test/scoped_feature_list.h"
 #include "mojo/public/cpp/bindings/clone_traits.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/events/test/event_generator.h"
@@ -46,8 +44,6 @@ class NetworkDetailedViewTest : public AshTestBase {
   void SetUp() override {
     AshTestBase::SetUp();
 
-    feature_list_.InitAndEnableFeature(features::kQuickSettingsNetworkRevamp);
-
     list_type_ = NetworkDetailedView::ListType::LIST_TYPE_NETWORK;
 
     network_detailed_view_ = new NetworkDetailedView(
@@ -112,7 +108,6 @@ class NetworkDetailedViewTest : public AshTestBase {
   FakeNetworkDetailedViewDelegate fake_network_detailed_view_delegate_;
   FakeDetailedViewDelegate fake_detailed_view_delegate_;
   NetworkDetailedView::ListType list_type_;
-  base::test::ScopedFeatureList feature_list_;
   base::UserActionTester user_action_tester_;
 };
 

ash/system/network/network_feature_pod_button_unittest.cc

@@ -6,10 +6,8 @@
 
 #include <memory>
 
-#include "ash/constants/ash_features.h"
 #include "ash/system/unified/feature_pod_button.h"
 #include "ash/test/ash_test_base.h"
-#include "base/test/scoped_feature_list.h"
 
 namespace ash {
 namespace {
@@ -37,8 +35,6 @@ class NetworkFeaturePodButtonTest : public AshTestBase {
   void SetUp() override {
     AshTestBase::SetUp();
 
-    feature_list_.InitAndEnableFeature(features::kQuickSettingsNetworkRevamp);
-
     network_feature_pod_button_ =
         std::make_unique<NetworkFeaturePodButton>(/*controller=*/nullptr,
                                                   /*delegate=*/delegate());
@@ -57,7 +53,6 @@ class NetworkFeaturePodButtonTest : public AshTestBase {
   }
 
  private:
-  base::test::ScopedFeatureList feature_list_;
   std::unique_ptr<NetworkFeaturePodButton> network_feature_pod_button_;
   FakeNetworkFeaturePodButtonDelegate fake_network_feature_pod_button_delegate_;
 };

ash/system/network/network_feature_pod_controller_unittest.cc

@@ -95,7 +95,6 @@ class NetworkFeaturePodControllerTest
   void SetUp() override {
     auto enabled_features = std::vector<base::test::FeatureRef>();
     auto disabled_features = std::vector<base::test::FeatureRef>();
-    enabled_features.push_back(features::kQuickSettingsNetworkRevamp);
     if (IsQsRevampEnabled()) {
       feature_list_.InitAndEnableFeature(features::kQsRevamp);
     } else {

ash/system/network/network_info_bubble_unittest.cc

@@ -7,13 +7,11 @@
 #include <string>
 #include <utility>
 
-#include "ash/constants/ash_features.h"
 #include "ash/strings/grit/ash_strings.h"
 #include "ash/test/ash_test_base.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/strcat.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/test/scoped_feature_list.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "chromeos/ash/services/network_config/public/cpp/cros_network_config_test_helper.h"
@@ -86,8 +84,6 @@ class NetworkInfoBubbleTest : public AshTestBase {
   void SetUp() override {
     AshTestBase::SetUp();
 
-    feature_list_.InitAndEnableFeature(features::kQuickSettingsNetworkRevamp);
-
     network_state_helper()->ClearDevices();
 
     network_state_helper()->manager_test()->AddTechnology(shill::kTypeCellular,
@@ -195,7 +191,6 @@ class NetworkInfoBubbleTest : public AshTestBase {
   network_config::CrosNetworkConfigTestHelper network_config_helper_;
   FakeNetworkInfoBubbleDelegate fake_delegate_;
   NetworkInfoBubble* network_info_bubble_ = nullptr;
-  base::test::ScopedFeatureList feature_list_;
   std::string wifi_path_;
   std::unique_ptr<views::Widget> widget_;
 

ash/system/network/network_list_mobile_header_view_unittest.cc

@@ -6,7 +6,6 @@
 
 #include <memory>
 
-#include "ash/constants/ash_features.h"
 #include "ash/public/cpp/test/test_system_tray_client.h"
 #include "ash/strings/grit/ash_strings.h"
 #include "ash/style/icon_button.h"
@@ -15,7 +14,6 @@
 #include "ash/test/ash_test_base.h"
 #include "base/run_loop.h"
 #include "base/test/bind.h"
-#include "base/test/scoped_feature_list.h"
 #include "chromeos/ash/components/network/network_device_handler.h"
 #include "chromeos/ash/components/network/network_state_handler.h"
 #include "chromeos/ash/components/network/network_type_pattern.h"
@@ -47,7 +45,6 @@ class NetworkListMobileHeaderViewTest : public AshTestBase {
   // AshTestBase:
   void SetUp() override {
     AshTestBase::SetUp();
-    feature_list_.InitAndEnableFeature(features::kQuickSettingsNetworkRevamp);
     network_state_helper()->ClearDevices();
 
     network_state_helper()->manager_test()->AddTechnology(shill::kTypeCellular,
@@ -131,7 +128,6 @@ class NetworkListMobileHeaderViewTest : public AshTestBase {
 
   std::unique_ptr<views::Widget> widget_;
   network_config::CrosNetworkConfigTestHelper network_config_helper_;
-  base::test::ScopedFeatureList feature_list_;
   FakeNetworkListNetworkHeaderViewDelegate
       fake_network_list_network_header_delegate_;
   NetworkListMobileHeaderViewImpl* network_list_mobile_header_view_;

ash/system/network/network_list_network_header_view_unittest.cc

@@ -6,14 +6,12 @@
 
 #include <memory>
 
-#include "ash/constants/ash_features.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/strings/grit/ash_strings.h"
 #include "ash/system/network/fake_network_list_network_header_view_delegate.h"
 #include "ash/system/network/network_list_header_view.h"
 #include "ash/system/tray/tri_view.h"
 #include "ash/test/ash_test_base.h"
-#include "base/test/scoped_feature_list.h"
 #include "ui/views/controls/button/toggle_button.h"
 #include "ui/views/view.h"
 
@@ -24,8 +22,6 @@ class NetworkListNetworkHeaderViewTest : public AshTestBase {
   void SetUp() override {
     AshTestBase::SetUp();
 
-    feature_list_.InitAndEnableFeature(features::kQuickSettingsNetworkRevamp);
-
     network_list_network_header_view_ =
         std::make_unique<NetworkListNetworkHeaderView>(
             &fake_network_list_network_header_delegate_,
@@ -63,7 +59,6 @@ class NetworkListNetworkHeaderViewTest : public AshTestBase {
   }
 
  private:
-  base::test::ScopedFeatureList feature_list_;
   FakeNetworkListNetworkHeaderViewDelegate
       fake_network_list_network_header_delegate_;
   std::unique_ptr<NetworkListNetworkHeaderView>

ash/system/network/network_list_network_item_view_unittest.cc

@@ -6,7 +6,6 @@
 
 #include <memory>
 
-#include "ash/constants/ash_features.h"
 #include "ash/public/cpp/login_types.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/session/session_controller_impl.h"
@@ -19,7 +18,6 @@
 #include "ash/test/ash_test_base.h"
 #include "base/functional/bind.h"
 #include "base/i18n/number_formatting.h"
-#include "base/test/scoped_feature_list.h"
 #include "chromeos/ash/services/network_config/public/cpp/cros_network_config_test_helper.h"
 #include "chromeos/services/network_config/public/mojom/cros_network_config.mojom.h"
 #include "third_party/cros_system_api/dbus/shill/dbus-constants.h"
@@ -67,8 +65,6 @@ class NetworkListNetworkItemViewTest : public AshTestBase {
   void SetUp() override {
     AshTestBase::SetUp();
 
-    feature_list_.InitAndEnableFeature(features::kQuickSettingsNetworkRevamp);
-
     SetUpDefaultNetworkDevices();
 
     fake_network_detailed_network_view_ =
@@ -162,7 +158,6 @@ class NetworkListNetworkItemViewTest : public AshTestBase {
     return &network_config_helper_.network_state_helper();
   }
 
-  base::test::ScopedFeatureList feature_list_;
   std::unique_ptr<views::Widget> widget_;
   std::unique_ptr<FakeNetworkDetailedNetworkView>
       fake_network_detailed_network_view_;
@@ -276,10 +271,6 @@ TEST_F(NetworkListNetworkItemViewTest, HasCorrectCellularSublabel) {
 }
 
 TEST_F(NetworkListNetworkItemViewTest, HasCorrectPortalSublabel) {
-  feature_list_.Reset();
-  feature_list_.InitWithFeatures(
-      /*enabled_features=*/{features::kQuickSettingsNetworkRevamp},
-      /*disabled_features=*/{});
   EXPECT_FALSE(network_list_network_item_view()->sub_text_label());
 
   NetworkStatePropertiesPtr wifi_network = CreateStandaloneNetworkProperties(
@@ -294,10 +285,6 @@ TEST_F(NetworkListNetworkItemViewTest, HasCorrectPortalSublabel) {
 }
 
 TEST_F(NetworkListNetworkItemViewTest, HasCorrectProxyAuthSublabel) {
-  feature_list_.Reset();
-  feature_list_.InitWithFeatures(
-      /*enabled_features=*/{features::kQuickSettingsNetworkRevamp},
-      /*disabled_features=*/{});
   EXPECT_FALSE(network_list_network_item_view()->sub_text_label());
 
   NetworkStatePropertiesPtr wifi_network = CreateStandaloneNetworkProperties(
@@ -312,10 +299,6 @@ TEST_F(NetworkListNetworkItemViewTest, HasCorrectProxyAuthSublabel) {
 }
 
 TEST_F(NetworkListNetworkItemViewTest, HasCorrectPortalSuspectedSublabel) {
-  feature_list_.Reset();
-  feature_list_.InitWithFeatures(
-      /*enabled_features=*/{features::kQuickSettingsNetworkRevamp},
-      /*disabled_features=*/{});
   EXPECT_FALSE(network_list_network_item_view()->sub_text_label());
 
   NetworkStatePropertiesPtr wifi_network = CreateStandaloneNetworkProperties(
@@ -330,10 +313,6 @@ TEST_F(NetworkListNetworkItemViewTest, HasCorrectPortalSuspectedSublabel) {
 }
 
 TEST_F(NetworkListNetworkItemViewTest, HasCorrectNoConnectivitySublabel) {
-  feature_list_.Reset();
-  feature_list_.InitWithFeatures(
-      /*enabled_features=*/{features::kQuickSettingsNetworkRevamp},
-      /*disabled_features=*/{});
   EXPECT_FALSE(network_list_network_item_view()->sub_text_label());
 
   NetworkStatePropertiesPtr wifi_network = CreateStandaloneNetworkProperties(

ash/system/network/network_list_view_controller_unittest.cc

@@ -181,10 +181,7 @@ class NetworkListViewControllerTest : public AshTestBase,
 
   void SetUp() override {
     if (IsQsRevampEnabled()) {
-      feature_list_.InitWithFeatures(
-          {features::kQsRevamp, features::kQuickSettingsNetworkRevamp}, {});
-    } else {
-      feature_list_.InitAndEnableFeature(features::kQuickSettingsNetworkRevamp);
+      feature_list_.InitWithFeatures({features::kQsRevamp}, {});
     }
     AshTestBase::SetUp();
 

ash/system/network/network_list_wifi_header_view_unittest.cc

@@ -6,15 +6,13 @@
 
 #include <memory>
 
-#include "ash/constants/ash_features.h"
 #include "ash/public/cpp/test/test_system_tray_client.h"
 #include "ash/strings/grit/ash_strings.h"
 #include "ash/style/icon_button.h"
 #include "ash/system/network/fake_network_list_network_header_view_delegate.h"
 #include "ash/system/tray/tray_toggle_button.h"
 #include "ash/test/ash_test_base.h"
 #include "base/run_loop.h"
-#include "base/test/scoped_feature_list.h"
 #include "chromeos/ash/services/network_config/public/cpp/cros_network_config_test_helper.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/controls/label.h"
@@ -30,7 +28,6 @@ class NetworkListWifiHeaderViewTest : public AshTestBase {
   // AshTestBase:
   void SetUp() override {
     AshTestBase::SetUp();
-    feature_list_.InitAndEnableFeature(features::kQuickSettingsNetworkRevamp);
 
     std::unique_ptr<NetworkListWifiHeaderViewImpl>
         network_list_wifi_header_view =
@@ -95,7 +92,6 @@ class NetworkListWifiHeaderViewTest : public AshTestBase {
 
   std::unique_ptr<views::Widget> widget_;
   network_config::CrosNetworkConfigTestHelper network_config_helper_;
-  base::test::ScopedFeatureList feature_list_;
   FakeNetworkListNetworkHeaderViewDelegate
       fake_network_list_network_header_delegate_;
   NetworkListWifiHeaderViewImpl* network_list_wifi_header_view_;

chrome/browser/about_flags.cc

@@ -3615,10 +3615,6 @@ const FeatureEntry kFeatureEntries[] = {
     {"qs-revamp", flag_descriptions::kQsRevampName,
      flag_descriptions::kQsRevampDescription, kOsCrOS,
      FEATURE_VALUE_TYPE(ash::features::kQsRevamp)},
-    {"quick-settings-network-revamp",
-     flag_descriptions::kQuickSettingsNetworkRevampName,
-     flag_descriptions::kQuickSettingsNetworkRevampDescription, kOsCrOS,
-     FEATURE_VALUE_TYPE(ash::features::kQuickSettingsNetworkRevamp)},
     {"use_messages_staging_url", flag_descriptions::kUseMessagesStagingUrlName,
      flag_descriptions::kUseMessagesStagingUrlDescription, kOsCrOS,
      FEATURE_VALUE_TYPE(ash::features::kUseMessagesStagingUrl)},