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

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/screens/update_screen.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 52 matching lines @@
                          UpdateEngineClient::UpdateCheckResult result) {
   VLOG(1) << "Callback from RequestUpdateCheck, result " << result;
   if (UpdateScreen::HasInstance(screen)) {
     if (result == UpdateEngineClient::UPDATE_RESULT_SUCCESS)
       screen->SetIgnoreIdleStatus(false);
     else
       screen->ExitUpdate(UpdateScreen::REASON_UPDATE_INIT_FAILED);
   }
 }
 
-// Returns true if blocking AU is enabled in command line.
-bool IsBlockingUpdateEnabledInCommandLine() {
-  return !CommandLine::ForCurrentProcess()->HasSwitch(
-      chromeos::switches::kDisableOOBEBlockingUpdate);
-}
-
 }  // anonymous namespace
 
 // static
 UpdateScreen::InstanceSet& UpdateScreen::GetInstanceSet() {
   CR_DEFINE_STATIC_LOCAL(std::set<UpdateScreen*>, instance_set, ());
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));  // not threadsafe.
   return instance_set;
 }
 
 // static
@@ skipping 49 matching lines @@
   switch (status.status) {
     case UpdateEngineClient::UPDATE_STATUS_CHECKING_FOR_UPDATE:
       // Do nothing in these cases, we don't want to notify the user of the
       // check unless there is an update.
       break;
     case UpdateEngineClient::UPDATE_STATUS_UPDATE_AVAILABLE:
       MakeSureScreenIsShown();
       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);
         actor_->ShowCurtain(false);
       }
       break;
     case UpdateEngineClient::UPDATE_STATUS_DOWNLOADING:
       {
         MakeSureScreenIsShown();
         if (!is_downloading_update_) {
           // Because update engine doesn't send UPDATE_STATUS_UPDATE_AVAILABLE
           // we need to is update critical on first downloading notification.
           is_downloading_update_ = true;
           download_start_time_ = download_last_time_ = base::Time::Now();
           download_start_progress_ = status.download_progress;
           download_last_progress_ = status.download_progress;
           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);
             actor_->ShowCurtain(false);
           }
         }
         UpdateDownloadingStats(status);
       }
       break;
     case UpdateEngineClient::UPDATE_STATUS_VERIFYING:
@@ skipping 89 matching lines @@
       UpdateErrorMessage(network, status);
       ShowErrorMessage();
     }
   }
 }
 
 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;
   }
   state_ = STATE_FIRST_PORTAL_CHECK;
   is_first_detection_notification_ = true;
   is_first_portal_notification_ = true;
   NetworkPortalDetector::Get()->AddAndFireObserver(this);
 }
 
 void UpdateScreen::CancelUpdate() {
@@ skipping 225 matching lines @@
       GetErrorScreen()->SetErrorState(ErrorScreen::ERROR_STATE_PROXY,
                                       std::string());
       break;
     default:
       NOTREACHED();
       break;
   }
 }
 
 }  // namespace chromeos