Commit b107dc07 authored by satorux@chromium.org's avatar satorux@chromium.org

chromeos: Implement the new D-Bus client for update engine.

This is part 1 of the UpdateLibrary to UpdateEngineClient migration.
The new files are added but not used from Chrome yet.

The new code is based on update_library.cc and chromeos_update_engine.cc,
and the new code will replace the them.

For code review, please refer to the files below:

http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/chromeos/cros/update_library.h?view=markup
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/chromeos/cros/update_library.cc?view=markup
http://git.chromium.org/gitweb/?p=chromiumos/platform/cros.git;a=blob;f=chromeos_update_engine.h;hb=HEAD
http://git.chromium.org/gitweb/?p=chromiumos/platform/cros.git;a=blob;f=chromeos_update_engine.cc;hb=HEAD

BUG=chromium-os:16564
TEST=chrome and tests build.

Review URL: http://codereview.chromium.org/8572020

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110467 0039d316-1c4b-4281-b951-d872f2087c98
parent c8de1677
// Copyright (c) 2011 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/dbus/mock_update_engine_client.h"
namespace chromeos {
MockUpdateEngineClient::MockUpdateEngineClient() {}
MockUpdateEngineClient::~MockUpdateEngineClient() {}
} // namespace chromeos
// Copyright (c) 2011 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.
#ifndef CHROME_BROWSER_CHROMEOS_DBUS_MOCK_UPDATE_ENGINE_CLIENT_H_
#define CHROME_BROWSER_CHROMEOS_DBUS_MOCK_UPDATE_ENGINE_CLIENT_H_
#include <string>
#include "chrome/browser/chromeos/dbus/update_engine_client.h"
#include "testing/gmock/include/gmock/gmock.h"
namespace chromeos {
class MockUpdateEngineClient : public UpdateEngineClient {
public:
MockUpdateEngineClient();
virtual ~MockUpdateEngineClient();
MOCK_METHOD1(AddObserver, void(Observer*));
MOCK_METHOD1(RemoveObserver, void(Observer*));
MOCK_METHOD1(HasObserver, bool(Observer*));
MOCK_METHOD1(RequestUpdateCheck, void(UpdateCheckCallback));
MOCK_METHOD0(RebootAfterUpdate, void());
MOCK_METHOD1(SetReleaseTrack, void(const std::string&));
MOCK_METHOD1(GetReleaseTrack, void(GetReleaseTrackCallback));
MOCK_METHOD0(GetLastStatus, Status());
};
} // namespace chromeos
#endif // CHROME_BROWSER_CHROMEOS_DBUS_MOCK_UPDATE_ENGINE_CLIENT_H_
This diff is collapsed.
// Copyright (c) 2011 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.
#ifndef CHROME_BROWSER_CHROMEOS_DBUS_UPDATE_ENGINE_CLIENT_H_
#define CHROME_BROWSER_CHROMEOS_DBUS_UPDATE_ENGINE_CLIENT_H_
#include "base/callback.h"
#include "base/observer_list.h"
#include <string>
namespace dbus {
class Bus;
} // namespace
namespace chromeos {
// UpdateEngineClient is used to communicate with the update engine.
class UpdateEngineClient {
public:
// Edges for state machine
// IDLE->CHECKING_FOR_UPDATE
// CHECKING_FOR_UPDATE->IDLE
// CHECKING_FOR_UPDATE->UPDATE_AVAILABLE
// ...
// FINALIZING->UPDATE_NEED_REBOOT
// Any state can transition to REPORTING_ERROR_EVENT and then on to IDLE.
enum UpdateStatusOperation {
UPDATE_STATUS_ERROR = -1,
UPDATE_STATUS_IDLE = 0,
UPDATE_STATUS_CHECKING_FOR_UPDATE,
UPDATE_STATUS_UPDATE_AVAILABLE,
UPDATE_STATUS_DOWNLOADING,
UPDATE_STATUS_VERIFYING,
UPDATE_STATUS_FINALIZING,
UPDATE_STATUS_UPDATED_NEED_REBOOT,
UPDATE_STATUS_REPORTING_ERROR_EVENT
};
// The status of the ongoing update attempt.
struct Status {
Status() : status(UPDATE_STATUS_IDLE),
download_progress(0.0),
last_checked_time(0),
new_size(0) {
}
UpdateStatusOperation status;
double download_progress; // 0.0 - 1.0
int64_t last_checked_time; // As reported by std::time().
std::string new_version;
int64_t new_size; // Valid during DOWNLOADING, in bytes.
};
// The result code used for RequestUpdateCheck().
enum UpdateCheckResult {
UPDATE_RESULT_SUCCESS,
UPDATE_RESULT_FAILED,
};
// Interface for observing changes from the update engine.
class Observer {
public:
// Called when the status is updated.
virtual void UpdateStatusChanged(const Status& status) {}
};
virtual ~UpdateEngineClient();
// Adds and removes the observer.
virtual void AddObserver(Observer* observer) = 0;
virtual void RemoveObserver(Observer* observer) = 0;
// Returns true if this object has the given observer.
virtual bool HasObserver(Observer* observer) = 0;
// Called once RequestUpdateCheck() is complete. Takes one parameter:
// - UpdateCheckResult: the result of the update check.
typedef base::Callback<void(UpdateCheckResult)> UpdateCheckCallback;
// Requests an update check and calls |callback| when completed.
virtual void RequestUpdateCheck(UpdateCheckCallback callback) = 0;
// Reboots if update has been performed.
virtual void RebootAfterUpdate() = 0;
// Requests to set the release track (channel). |track| should look like
// "beta-channel" or "dev-channel".
virtual void SetReleaseTrack(const std::string& track) = 0;
// Called once GetReleaseTrack() is complete. Takes one parameter;
// - string: the release track name like "beta-channel".
typedef base::Callback<void(const std::string&)> GetReleaseTrackCallback;
// Requests to get the release track and calls |callback| with the
// release track (channel). On error, calls |callback| with an empty
// string.
virtual void GetReleaseTrack(GetReleaseTrackCallback callback) = 0;
// Returns the last status the object received from the update engine.
//
// Ideally, the D-Bus client should be state-less, but there are clients
// that need this information.
virtual Status GetLastStatus() = 0;
// Returns an empty UpdateCheckCallback that does nothing.
static UpdateCheckCallback EmptyUpdateCheckCallback();
// Creates the instance.
static UpdateEngineClient* Create(dbus::Bus* bus);
protected:
// Create() should be used instead.
UpdateEngineClient();
private:
DISALLOW_COPY_AND_ASSIGN(UpdateEngineClient);
};
} // namespace chromeos
#endif // CHROME_BROWSER_CHROMEOS_DBUS_UPDATE_ENGINE_CLIENT_H_
...@@ -450,6 +450,8 @@ ...@@ -450,6 +450,8 @@
'browser/chromeos/dbus/session_manager_client.h', 'browser/chromeos/dbus/session_manager_client.h',
'browser/chromeos/dbus/speech_synthesizer_client.cc', 'browser/chromeos/dbus/speech_synthesizer_client.cc',
'browser/chromeos/dbus/speech_synthesizer_client.h', 'browser/chromeos/dbus/speech_synthesizer_client.h',
'browser/chromeos/dbus/update_engine_client.cc',
'browser/chromeos/dbus/update_engine_client.h',
'browser/chromeos/disks/disk_mount_manager.cc', 'browser/chromeos/disks/disk_mount_manager.cc',
'browser/chromeos/disks/disk_mount_manager.h', 'browser/chromeos/disks/disk_mount_manager.h',
'browser/chromeos/drop_shadow_label.cc', 'browser/chromeos/drop_shadow_label.cc',
......
...@@ -110,6 +110,8 @@ ...@@ -110,6 +110,8 @@
'browser/chromeos/dbus/mock_session_manager_client.h', 'browser/chromeos/dbus/mock_session_manager_client.h',
'browser/chromeos/dbus/mock_speech_synthesizer_client.cc', 'browser/chromeos/dbus/mock_speech_synthesizer_client.cc',
'browser/chromeos/dbus/mock_speech_synthesizer_client.h', 'browser/chromeos/dbus/mock_speech_synthesizer_client.h',
'browser/chromeos/dbus/mock_update_engine_client.cc',
'browser/chromeos/dbus/mock_update_engine_client.h',
'browser/chromeos/login/mock_signed_settings_helper.cc', 'browser/chromeos/login/mock_signed_settings_helper.cc',
'browser/chromeos/login/mock_signed_settings_helper.h', 'browser/chromeos/login/mock_signed_settings_helper.h',
# The only thing used from browser is Browser::Type. # The only thing used from browser is Browser::Type.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment