Use MockDBusThreadManagerWithoutGMock for GetUpdateStatusApiTest

chromeos/dbus/fake_update_engine_client.h

Index: chromeos/dbus/fake_update_engine_client.h
diff --git a/chromeos/dbus/fake_update_engine_client.h b/chromeos/dbus/fake_update_engine_client.h
index ccf25041be4164e05b85bb6816f477a7f66e90e6..f98f6461d79b5853d9d4e5d3bae7f781e98485ea 100644
--- a/chromeos/dbus/fake_update_engine_client.h
+++ b/chromeos/dbus/fake_update_engine_client.h
@@ -5,6 +5,7 @@
 #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"
@@ -31,8 +32,16 @@ class FakeUpdateEngineClient : public UpdateEngineClient {
       OVERRIDE;
   virtual Status GetLastStatus() OVERRIDE;
 
-  void set_update_engine_client_status(
-      const UpdateEngineClient::Status& status);
+  // Push UpdateEngineClient::Status in the queue to test changing status.

[hashimoto, 2013/05/14 14:47:54]

nit: s/Push/Pushes/?

[Haruki Sato, 2013/05/15 02:01:08]

Done. Thanks!

+  // GetLastStatus() returns the status set by this method in FIFO order.
+  // See set_default_status().
+  void PushLastStatus(const UpdateEngineClient::Status& status) {
+    status_queue_.push(status);
+  }
+
+  // Sets the default UpdateEngineClient::Status. GetLastStatus() returns the
+  // value set here if |status_queue_| is empty.
+  void set_default_status(const UpdateEngineClient::Status& status);
 
   // Sets a value returned by RequestUpdateCheck().
   void set_update_check_result(
@@ -44,7 +53,8 @@ class FakeUpdateEngineClient : public UpdateEngineClient {
   }
 
  private:
-  UpdateEngineClient::Status update_engine_client_status_;
+  std::queue<UpdateEngineClient::Status> status_queue_;
+  UpdateEngineClient::Status default_status_;
   UpdateEngineClient::UpdateCheckResult update_check_result_;
   int reboot_after_update_call_count_;
 };