Use MockDBusThreadManagerWithoutGMock for GetUpdateStatusApiTest

chromeos/dbus/fake_update_engine_client.h

 // 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.
 
 #ifndef CHROMEOS_DBUS_FAKE_UPDATE_ENGINE_CLIENT_H_
 #define CHROMEOS_DBUS_FAKE_UPDATE_ENGINE_CLIENT_H_
 
+#include <queue>
 #include <string>
 
 #include "chromeos/dbus/update_engine_client.h"
 
 namespace chromeos {
 
 // A fake implementation of UpdateEngineClient. The user of this class can
 // use set_update_engine_client_status() to set a fake last Status and
 // GetLastStatus() returns the fake with no modification. Other methods do
 // nothing.
 class FakeUpdateEngineClient : public UpdateEngineClient {
  public:
   FakeUpdateEngineClient();
   virtual ~FakeUpdateEngineClient();
 
   // Overrides
   virtual void AddObserver(Observer* observer) OVERRIDE;
   virtual void RemoveObserver(Observer* observer) OVERRIDE;
   virtual bool HasObserver(Observer* observer) OVERRIDE;
   virtual void RequestUpdateCheck(const UpdateCheckCallback& callback) OVERRIDE;
   virtual void RebootAfterUpdate() OVERRIDE;
   virtual void SetReleaseTrack(const std::string& track) OVERRIDE;
   virtual void GetReleaseTrack(const GetReleaseTrackCallback& callback)
       OVERRIDE;
   virtual Status GetLastStatus() OVERRIDE;
 
+  // Push UpdateEngineClient::Status in the queue to test changing status.
+  // GetLastStatus() returns the status set by this method in FIFO order.
+  // See set_update_engine_client_status() as well.
+  void PushLastStatus(const UpdateEngineClient::Status& status) {
+    status_queue_.push(status);
+  }
+
+  // Sets the default update_engine_client_status() as well. GetLastStatus()
+  // returns the value set here if |status_queue_| is empty.
   void set_update_engine_client_status(
       const UpdateEngineClient::Status& status);
 
   // Sets a value returned by RequestUpdateCheck().
   void set_update_check_result(
       const UpdateEngineClient::UpdateCheckResult& result);
 
   // Returns how many times RebootAfterUpdate() is called.
   int reboot_after_update_call_count() {
     return reboot_after_update_call_count_;
   }
 
  private:
+  std::queue<UpdateEngineClient::Status> status_queue_;
   UpdateEngineClient::Status update_engine_client_status_;

[hashimoto, 2013/05/14 10:37:21]

How about renaming this to default_status_ to clarify the role of this variable?
Or, can't we remove this since no one is interested in this variable at all?

[Haruki Sato, 2013/05/14 13:20:14]

Good point. It is used for another unittest.
Renamed. Thanks.

   UpdateEngineClient::UpdateCheckResult update_check_result_;
   int reboot_after_update_call_count_;
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DBUS_FAKE_UPDATE_ENGINE_CLIENT_H_