Use MockDBusThreadManagerWithoutGMock for GetUpdateStatusApiTest

chrome/browser/extensions/api/system_private/system_private_apitest.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 "base/prefs/pref_service.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/pref_names.h"
 
 #if defined(OS_CHROMEOS)
-#include "chromeos/dbus/mock_dbus_thread_manager.h"
-#include "chromeos/dbus/mock_update_engine_client.h"
+#include "chromeos/dbus/fake_update_engine_client.h"
+#include "chromeos/dbus/mock_dbus_thread_manager_without_gmock.h"
 
 using chromeos::UpdateEngineClient;
-using ::testing::Return;
 #endif
 
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, GetIncognitoModeAvailability) {
   PrefService* pref_service = browser()->profile()->GetPrefs();
   pref_service->SetInteger(prefs::kIncognitoModeAvailability, 1);
 
   EXPECT_TRUE(RunComponentExtensionTest(
       "system/get_incognito_mode_availability")) << message_;
 }
 
 #if defined(OS_CHROMEOS)
 
 class GetUpdateStatusApiTest : public ExtensionApiTest {
  public:
-  GetUpdateStatusApiTest() : mock_update_engine_client_(NULL) {}
+  GetUpdateStatusApiTest() : fake_update_engine_client_(NULL) {}
 
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
     ExtensionApiTest::SetUpInProcessBrowserTestFixture();
-    chromeos::MockDBusThreadManager* mock_dbus_thread_manager =
-        new chromeos::MockDBusThreadManager;
+    chromeos::MockDBusThreadManagerWithoutGMock* mock_dbus_thread_manager =
+        new chromeos::MockDBusThreadManagerWithoutGMock;
     chromeos::DBusThreadManager::InitializeForTesting(mock_dbus_thread_manager);
-    mock_update_engine_client_ =
-        mock_dbus_thread_manager->mock_update_engine_client();
-    EXPECT_CALL(*mock_update_engine_client_, GetLastStatus())
-        .Times(1)

[bartfab (slow), 2013/05/14 09:35:06]

This used to verify that the method gets called exactly once. Could you add a
corresponding check to the new version?

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

Do we need to check that GetLastStatus() is called to get the empty status?
I think there is no need to add a such kind of check because
GetUpdateStatusApiTest.Progress does enough test for GetLastStatus().

[bartfab (slow), 2013/05/14 10:53:14]

Fair enough. Let's leave out the check.

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

Thank you guys for the review!

-        .WillOnce(Return(chromeos::MockUpdateEngineClient::Status()));
+    fake_update_engine_client_ =
+        mock_dbus_thread_manager->fake_update_engine_client();
   }
 
   virtual void TearDownInProcessBrowserTestFixture() OVERRIDE {
     chromeos::DBusThreadManager::Shutdown();
     ExtensionApiTest::TearDownInProcessBrowserTestFixture();
   }
 
  protected:
-  chromeos::MockUpdateEngineClient* mock_update_engine_client_;
+  chromeos::FakeUpdateEngineClient* fake_update_engine_client_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(GetUpdateStatusApiTest);
 };
 
 IN_PROC_BROWSER_TEST_F(GetUpdateStatusApiTest, Progress) {
   UpdateEngineClient::Status status_not_available;
   status_not_available.status = UpdateEngineClient::UPDATE_STATUS_IDLE;
   UpdateEngineClient::Status status_updating;
   status_updating.status = UpdateEngineClient::UPDATE_STATUS_DOWNLOADING;
   status_updating.download_progress = 0.5;
   UpdateEngineClient::Status status_boot_needed;
   status_boot_needed.status =
       UpdateEngineClient::UPDATE_STATUS_UPDATED_NEED_REBOOT;
 
-  EXPECT_CALL(*mock_update_engine_client_, GetLastStatus())
-      .WillOnce(Return(status_not_available))
-      .WillOnce(Return(status_updating))
-      .WillOnce(Return(status_boot_needed));
+  // The fake client returns the last status in this order.
+  fake_update_engine_client_->PushLastStatus(status_not_available);
+  fake_update_engine_client_->PushLastStatus(status_updating);
+  fake_update_engine_client_->PushLastStatus(status_boot_needed);
+
   ASSERT_TRUE(RunComponentExtensionTest(
       "system/get_update_status")) << message_;
 }
 
 #endif