Remove network-portal-notification flags

This feature has been enabled by default since 2014. Bug: None Change-Id: I404ce94ff6d420daa96cb2730e6cd25985b637cf Reviewed-on: https://chromium-review.googlesource.com/c/1361647 Commit-Queue: Steven Bennetts <stevenjb@chromium.org> Reviewed-by: Toni Baržić <tbarzic@chromium.org> Reviewed-by: Elly Fong-Jones <ellyjones@chromium.org> Cr-Commit-Position: refs/heads/master@{#613734}
Denger-Network · Dec 4, 2018 · 887503b · 887503b
1 parent b73ca40
commit 887503b
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 34 deletions.
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
@@ -1575,12 +1575,6 @@ const FeatureEntry kFeatureEntries[] = {
      kOsWin | kOsLinux | kOsCrOS | kOsAndroid,
      SINGLE_DISABLE_VALUE_TYPE(switches::kDisableTouchAdjustment)},
 #if defined(OS_CHROMEOS)
-    {"network-portal-notification",
-     flag_descriptions::kNetworkPortalNotificationName,
-     flag_descriptions::kNetworkPortalNotificationDescription, kOsCrOS,
-     ENABLE_DISABLE_VALUE_TYPE(
-         chromeos::switches::kEnableNetworkPortalNotification,
-         chromeos::switches::kDisableNetworkPortalNotification)},
     {"enable-captive-portal-random-url",
      flag_descriptions::kEnableCaptivePortalRandomUrl,
      flag_descriptions::kEnableCaptivePortalRandomUrlDescription, kOsCrOS,

diff --git a/chrome/browser/chromeos/net/network_portal_detector_impl_unittest.cc b/chrome/browser/chromeos/net/network_portal_detector_impl_unittest.cc
@@ -81,9 +81,6 @@ class NetworkPortalDetectorImplTest
       : test_profile_manager_(TestingBrowserProcess::GetGlobal()) {}
 
   void SetUp() override {
-    base::CommandLine* cl = base::CommandLine::ForCurrentProcess();
-    cl->AppendSwitch(switches::kDisableNetworkPortalNotification);
-
     FakeChromeUserManager* user_manager = new FakeChromeUserManager();
     user_manager_enabler_ = std::make_unique<user_manager::ScopedUserManager>(
         base::WrapUnique(user_manager));

diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
@@ -2469,11 +2469,6 @@
     // "owners": [ "your-team" ],
     "expiry_milestone": 76
   },
-  {
-    "name": "network-portal-notification",
-    // "owners": [ "your-team" ],
-    "expiry_milestone": 76
-  },
   {
     "name": "network-service",
     // "owners": [ "your-team" ],

diff --git a/chrome/browser/ui/ash/network/network_portal_notification_controller.cc b/chrome/browser/ui/ash/network/network_portal_notification_controller.cc
@@ -53,11 +53,6 @@ namespace {
 
 const char kNotifierNetworkPortalDetector[] = "ash.network.portal-detector";
 
-bool IsPortalNotificationEnabled() {
-  return !base::CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kDisableNetworkPortalNotification);
-}
-
 Profile* GetProfileForPrimaryUser() {
   const user_manager::User* primary_user =
       user_manager::UserManager::Get()->GetPrimaryUser();
@@ -258,9 +253,6 @@ void NetworkPortalNotificationController::DefaultNetworkChanged(
 void NetworkPortalNotificationController::OnPortalDetectionCompleted(
     const NetworkState* network,
     const NetworkPortalDetector::CaptivePortalState& state) {
-  if (!IsPortalNotificationEnabled())
-    return;
-
   if (!network ||
       state.status != NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL) {
     last_network_guid_.clear();

diff --git a/chrome/browser/ui/ash/network/network_portal_notification_controller_unittest.cc b/chrome/browser/ui/ash/network/network_portal_notification_controller_unittest.cc
@@ -39,8 +39,6 @@ class NetworkPortalNotificationControllerTest
 
   void SetUp() override {
     BrowserWithTestWindowTest::SetUp();
-    base::CommandLine* cl = base::CommandLine::ForCurrentProcess();
-    cl->AppendSwitch(switches::kEnableNetworkPortalNotification);
 
     TestingBrowserProcess::GetGlobal()->SetSystemNotificationHelper(
         std::make_unique<SystemNotificationHelper>());

diff --git a/chromeos/chromeos_switches.cc b/chromeos/chromeos_switches.cc
@@ -237,10 +237,6 @@ const char kDisableMtpWriteSupport[] = "disable-mtp-write-support";
 // Disables the multiple display layout UI.
 const char kDisableMultiDisplayLayout[] = "disable-multi-display-layout";
 
-// Disables notifications about captive portals in session.
-const char kDisableNetworkPortalNotification[] =
-    "disable-network-portal-notification";
-
 // Disables the new Korean IME in chrome://settings/languages.
 const char kDisableNewKoreanIme[] = "disable-new-korean-ime";
 
@@ -330,10 +326,6 @@ const char kEnableFirstRunUITransitions[] = "enable-first-run-ui-transitions";
 // Enables the marketing opt-in screen in OOBE.
 const char kEnableMarketingOptInScreen[] = "enable-market-opt-in";
 
-// Enables notifications about captive portals in session.
-const char kEnableNetworkPortalNotification[] =
-    "enable-network-portal-notification";
-
 // Enables offline demo mode. Demo mode still requires ARC++.
 const char kEnableOfflineDemoMode[] = "enable-offline-demo-mode";
 

diff --git a/chromeos/chromeos_switches.h b/chromeos/chromeos_switches.h
@@ -71,7 +71,6 @@ CHROMEOS_EXPORT extern const char kDisableLoginAnimations[];
 CHROMEOS_EXPORT extern const char kDisableMachineCertRequest[];
 CHROMEOS_EXPORT extern const char kDisableMtpWriteSupport[];
 CHROMEOS_EXPORT extern const char kDisableMultiDisplayLayout[];
-CHROMEOS_EXPORT extern const char kDisableNetworkPortalNotification[];
 CHROMEOS_EXPORT extern const char kDisableNewKoreanIme[];
 CHROMEOS_EXPORT extern const char kDisableNewZIPUnpacker[];
 CHROMEOS_EXPORT extern const char kDisableOfficeEditingComponentApp[];
@@ -97,7 +96,6 @@ CHROMEOS_EXPORT extern const char kEnableExtensionAssetsSharing[];
 CHROMEOS_EXPORT extern const char kEnableFileManagerTouchMode[];
 CHROMEOS_EXPORT extern const char kEnableFirstRunUITransitions[];
 CHROMEOS_EXPORT extern const char kEnableMarketingOptInScreen[];
-CHROMEOS_EXPORT extern const char kEnableNetworkPortalNotification[];
 CHROMEOS_EXPORT extern const char kEnableOfflineDemoMode[];
 CHROMEOS_EXPORT extern const char kEnablePhysicalKeyboardAutocorrect[];
 CHROMEOS_EXPORT extern const char kEnableRequestTabletSite[];