summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsatorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-21 19:30:10 +0000
committersatorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-21 19:30:10 +0000
commitcd630dae8c2731af602a4ad6913e394517714c1a (patch)
tree48c57e54087bfb0e4d71928e2c2b9fff10f82c37
parent77981db45d0e6e2367ce6e8bf341e512eb750cc2 (diff)
downloadchromium_src-cd630dae8c2731af602a4ad6913e394517714c1a.zip
chromium_src-cd630dae8c2731af602a4ad6913e394517714c1a.tar.gz
chromium_src-cd630dae8c2731af602a4ad6913e394517714c1a.tar.bz2
chromeos: Make RebootAfterUpdate a void function.
The return value is not used at all. This is a preparation work for moving update engine D-Bus code from libcros to Chrome. We want to make semantics clearler beforehand. TEST=chrome builds BUG=chromium-os:16564 Review URL: http://codereview.chromium.org/8354024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106757 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/chromeos/cros/mock_update_library.h2
-rw-r--r--chrome/browser/chromeos/cros/update_library.cc6
-rw-r--r--chrome/browser/chromeos/cros/update_library.h2
3 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/chromeos/cros/mock_update_library.h b/chrome/browser/chromeos/cros/mock_update_library.h
index 4e0db625..f1cb7046 100644
--- a/chrome/browser/chromeos/cros/mock_update_library.h
+++ b/chrome/browser/chromeos/cros/mock_update_library.h
@@ -22,7 +22,7 @@ class MockUpdateLibrary : public UpdateLibrary {
MOCK_METHOD1(RemoveObserver, void(Observer*)); // NOLINT
MOCK_METHOD1(HasObserver, bool(Observer*));
MOCK_METHOD2(RequestUpdateCheck, void(chromeos::UpdateCallback, void*));
- MOCK_METHOD0(RebootAfterUpdate, bool(void));
+ MOCK_METHOD0(RebootAfterUpdate, void(void));
MOCK_METHOD1(SetReleaseTrack, void(const std::string&));
MOCK_METHOD2(GetReleaseTrack, void(chromeos::UpdateTrackCallback, void*));
MOCK_CONST_METHOD0(status, const Status&(void));
diff --git a/chrome/browser/chromeos/cros/update_library.cc b/chrome/browser/chromeos/cros/update_library.cc
index 2a30560..fb0efb3 100644
--- a/chrome/browser/chromeos/cros/update_library.cc
+++ b/chrome/browser/chromeos/cros/update_library.cc
@@ -52,8 +52,8 @@ class UpdateLibraryImpl : public UpdateLibrary {
chromeos::RequestUpdateCheck(callback, user_data);
}
- virtual bool RebootAfterUpdate() OVERRIDE {
- return RebootIfUpdated();
+ virtual void RebootAfterUpdate() OVERRIDE {
+ chromeos::RebootIfUpdated();
}
virtual void SetReleaseTrack(const std::string& track) OVERRIDE {
@@ -112,7 +112,7 @@ class UpdateLibraryStubImpl : public UpdateLibrary {
if (callback)
callback(user_data, UPDATE_RESULT_FAILED, "stub update");
}
- virtual bool RebootAfterUpdate() OVERRIDE { return false; }
+ virtual void RebootAfterUpdate() OVERRIDE {}
virtual void SetReleaseTrack(const std::string& track) OVERRIDE {}
virtual void GetReleaseTrack(chromeos::UpdateTrackCallback callback,
void* user_data) OVERRIDE {
diff --git a/chrome/browser/chromeos/cros/update_library.h b/chrome/browser/chromeos/cros/update_library.h
index 607af87..7370f7f 100644
--- a/chrome/browser/chromeos/cros/update_library.h
+++ b/chrome/browser/chromeos/cros/update_library.h
@@ -65,7 +65,7 @@ class UpdateLibrary {
void* user_data) = 0;
// Reboots if update has been performed.
- virtual bool RebootAfterUpdate() = 0;
+ virtual void RebootAfterUpdate() = 0;
// Sets the release track (channel). |track| should look like
// "beta-channel" and "dev-channel". Returns true on success.