Switch on-demand update checks to the less-old GoogleUpdate3 API.

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/browser_process.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h"
 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/ui/webui/help/help_utils_chromeos.h"
 #include "chrome/grit/generated_resources.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager_client.h"
 #include "chromeos/network/network_handler.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "chromeos/settings/cros_settings_names.h"
+#include "content/public/browser/web_contents.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using chromeos::CrosSettings;
 using chromeos::DBusThreadManager;
 using chromeos::OwnerSettingsServiceChromeOS;
 using chromeos::OwnerSettingsServiceChromeOSFactory;
 using chromeos::UpdateEngineClient;
 using chromeos::WizardController;
 
@@ skipping 67 matching lines @@
             help_utils_chromeos::GetConnectionTypeAsUTF16(network->type()));
     callback.Run(VersionUpdater::FAILED_CONNECTION_TYPE_DISALLOWED, 0, message);
     return false;
   }
 
   return true;
 }
 
 }  // namespace
 
-VersionUpdater* VersionUpdater::Create(content::BrowserContext* context) {
-  return new VersionUpdaterCros(context);
+VersionUpdater* VersionUpdater::Create(content::WebContents* web_contents) {
+  return new VersionUpdaterCros(web_contents);
 }
 
 void VersionUpdaterCros::GetUpdateStatus(const StatusCallback& callback) {
   callback_ = callback;
 
   if (!EnsureCanUpdate(callback))
     return;
 
   UpdateEngineClient* update_engine_client =
       DBusThreadManager::Get()->GetUpdateEngineClient();
@@ skipping 50 matching lines @@
 
 void VersionUpdaterCros::GetChannel(bool get_current_channel,
                                     const ChannelCallback& cb) {
   UpdateEngineClient* update_engine_client =
       DBusThreadManager::Get()->GetUpdateEngineClient();
 
   // Request the channel information.
   update_engine_client->GetChannel(get_current_channel, cb);
 }
 
-VersionUpdaterCros::VersionUpdaterCros(content::BrowserContext* context)
-    : context_(context),
+VersionUpdaterCros::VersionUpdaterCros(content::WebContents* web_contents)
+    : context_(web_contents ? web_contents->GetBrowserContext() : nullptr),
       last_operation_(UpdateEngineClient::UPDATE_STATUS_IDLE),
       check_for_update_when_idle_(false),
       weak_ptr_factory_(this) {
 }
 
 VersionUpdaterCros::~VersionUpdaterCros() {
   UpdateEngineClient* update_engine_client =
       DBusThreadManager::Get()->GetUpdateEngineClient();
   update_engine_client->RemoveObserver(this);
 }
@@ skipping 55 matching lines @@
   }
 }
 
 void VersionUpdaterCros::OnUpdateCheck(
     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, base::string16());
 }