Move part of WizardController static code to StartupUtils

chrome/browser/ui/webui/help/version_updater_chromeos.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/ui/webui/help/version_updater_chromeos.h"
 
 #include <cmath>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
+#include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/cros_settings_names.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager_client.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using chromeos::CrosSettings;
 using chromeos::DBusThreadManager;
 using chromeos::UpdateEngineClient;
 using chromeos::UserManager;
 using chromeos::WizardController;
 
 VersionUpdater* VersionUpdater::Create() {
   return new VersionUpdaterCros;
 }
 
 void VersionUpdaterCros::CheckForUpdate(const StatusCallback& callback) {
   callback_ = callback;
 
   UpdateEngineClient* update_engine_client =
       DBusThreadManager::Get()->GetUpdateEngineClient();
   update_engine_client->AddObserver(this);
 
   // Make sure that libcros is loaded and OOBE is complete.
   if (!WizardController::default_controller() ||
-      WizardController::IsDeviceRegistered()) {
+      chromeos::StartupUtils::IsDeviceRegistered()) {
     update_engine_client->RequestUpdateCheck(
         base::Bind(&VersionUpdaterCros::OnUpdateCheck,
                    weak_ptr_factory_.GetWeakPtr()));
   }
 }
 
 void VersionUpdaterCros::RelaunchBrowser() const {
   DBusThreadManager::Get()->GetPowerManagerClient()->RequestRestart();
 }
 
@@ skipping 84 matching lines @@
     UpdateEngineClient::UpdateCheckResult result) {
   // If version updating is not implemented, this binary is the most up-to-date
   // possible with respect to automatic updating.
   if (result == UpdateEngineClient::UPDATE_RESULT_NOTIMPLEMENTED)
     callback_.Run(UPDATED, 0, string16());
 }
 
 void VersionUpdaterCros::UpdateSelectedChannel(const std::string& channel) {
   channel_callback_.Run(channel);
 }