Deleted switch '--disable-oobe-blocking-update'

BUG=349033
TEST=browser_tests:UpdateScreen*

Review URL: https://codereview.chromium.org/212303003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259598 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/chromeos/login/screens/update_screen.cc

@@ -70,12 +70,6 @@ void StartUpdateCallback(UpdateScreen* screen,
   }
 }
 
-// Returns true if blocking AU is enabled in command line.
-bool IsBlockingUpdateEnabledInCommandLine() {
-  return !CommandLine::ForCurrentProcess()->HasSwitch(
-      chromeos::switches::kDisableOOBEBlockingUpdate);
-}
-
 }  // anonymous namespace
 
 // static
@@ -145,12 +139,10 @@ void UpdateScreen::UpdateStatusChanged(
       actor_->SetProgress(kBeforeDownloadProgress);
       actor_->ShowEstimatedTimeLeft(false);
       if (!HasCriticalUpdate()) {
-        LOG(INFO) << "Noncritical update available: "
-                  << status.new_version;
+        VLOG(1) << "Noncritical update available: " << status.new_version;
         ExitUpdate(REASON_UPDATE_NON_CRITICAL);
       } else {
-        LOG(INFO) << "Critical update available: "
-                  << status.new_version;
+        VLOG(1) << "Critical update available: " << status.new_version;
         actor_->SetProgressMessage(
             UpdateScreenActor::PROGRESS_MESSAGE_UPDATE_AVAILABLE);
         actor_->ShowProgressMessage(true);
@@ -170,12 +162,10 @@ void UpdateScreen::UpdateStatusChanged(
           is_download_average_speed_computed_ = false;
           download_average_speed_ = 0.0;
           if (!HasCriticalUpdate()) {
-            LOG(INFO) << "Non-critical update available: "
-                      << status.new_version;
+            VLOG(1) << "Non-critical update available: " << status.new_version;
             ExitUpdate(REASON_UPDATE_NON_CRITICAL);
           } else {
-            LOG(INFO) << "Critical update available: "
-                      << status.new_version;
+            VLOG(1) << "Critical update available: " << status.new_version;
             actor_->SetProgressMessage(
                 UpdateScreenActor::PROGRESS_MESSAGE_INSTALLING_UPDATE);
             actor_->ShowProgressMessage(true);
@@ -285,8 +275,7 @@ void UpdateScreen::StartNetworkCheck() {
   // If portal detector is enabled and portal detection before AU is
   // allowed, initiate network state check. Otherwise, directly
   // proceed to update.
-  if (!NetworkPortalDetector::Get()->IsEnabled() ||
-      !IsBlockingUpdateEnabledInCommandLine()) {
+  if (!NetworkPortalDetector::Get()->IsEnabled()) {
     StartUpdateCheck();
     return;
   }

chromeos/chromeos_switches.cc

@@ -58,11 +58,6 @@ const char kDisableVolumeAdjustSound[] = "disable-volume-adjust-sound";
 const char kDisableNetworkPortalNotification[] =
     "disable-network-portal-notification";
 
-// Disables portal detection and network error handling before auto
-// update.
-const char kDisableOOBEBlockingUpdate[] =
-    "disable-oobe-blocking-update";
-
 // Enables overriding the path for the default echo component extension.
 // Useful for testing.
 const char kEchoExtensionPath[]             = "echo-ext-path";

chromeos/chromeos_switches.h

@@ -33,7 +33,6 @@ CHROMEOS_EXPORT extern const char kDisableLoginAnimations[];
 CHROMEOS_EXPORT extern const char kDisableNetworkPortalNotification[];
 CHROMEOS_EXPORT extern const char kDisableNewChannelSwitcherUI[];
 CHROMEOS_EXPORT extern const char kDisableNewKioskUI[];
-CHROMEOS_EXPORT extern const char kDisableOOBEBlockingUpdate[];
 CHROMEOS_EXPORT extern const char kDisableQuickofficeComponentApp[];
 CHROMEOS_EXPORT extern const char kDisableVolumeAdjustSound[];
 CHROMEOS_EXPORT extern const char kEchoExtensionPath[];