dbus: Use MockDBusThreadManagerWithoutGMock for InputMethodEngineIBusBrowserTest

chrome/browser/chromeos/input_method/input_method_engine_ibus_browserttests.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/bind_helpers.h"
 #include "chrome/browser/chromeos/input_method/input_method_configuration.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/ibus/mock_ibus_client.h"
 #include "chromeos/dbus/ibus/mock_ibus_engine_factory_service.h"
 #include "chromeos/dbus/ibus/mock_ibus_engine_service.h"
-#include "chromeos/dbus/mock_dbus_thread_manager.h"
+#include "chromeos/dbus/mock_dbus_thread_manager_without_gmock.h"
 #include "chromeos/dbus/mock_update_engine_client.h"
 #include "chromeos/ime/input_method_descriptor.h"
 #include "chromeos/ime/input_method_manager.h"
 #include "content/public/test/test_utils.h"
 #include "dbus/mock_bus.h"
 
-// TODO(nona): Remove gmock dependency once crbug.com/223061 is fixed.
-#include "testing/gmock/include/gmock/gmock.h"
-
-using testing::Return;
-using testing::_;
-
 namespace chromeos {
 namespace input_method {
 namespace {
 
 const char kIdentityIMEID[] =
     "_ext_ime_iafoklpfplgfnoimmaejoeondnjnlcfpIdentityIME";
 const char kToUpperIMEID[] =
     "_ext_ime_iafoklpfplgfnoimmaejoeondnjnlcfpToUpperIME";
 const char kEchoBackIMEID[] =
     "_ext_ime_iafoklpfplgfnoimmaejoeondnjnlcfpEchoBackIME";
@@ skipping 15 matching lines @@
 class InputMethodEngineIBusBrowserTest
     : public ExtensionBrowserTest,
       public ::testing::WithParamInterface<TestType> {
  public:
   InputMethodEngineIBusBrowserTest()
       : ExtensionBrowserTest(),
         mock_dbus_thread_manager_(NULL) {}
   virtual ~InputMethodEngineIBusBrowserTest() {}
 
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
-    mock_dbus_thread_manager_ = new MockDBusThreadManager();
+    mock_dbus_thread_manager_ = new MockDBusThreadManagerWithoutGMock();
     DBusThreadManager::InitializeForTesting(mock_dbus_thread_manager_);
     ExtensionBrowserTest::SetUpInProcessBrowserTestFixture();
-
-    // Necessary for launching browser tests with MockDBusThreadManager.
-    // TODO(nona): Remove this once crbug.com/223061 is fixed.
-    EXPECT_CALL(*mock_dbus_thread_manager_->mock_update_engine_client(),
-                GetLastStatus())
-        .Times(1)
-        .WillOnce(Return(chromeos::MockUpdateEngineClient::Status()));
-
-    // TODO(nona): Remove this once crbug.com/223061 is fixed.
-    EXPECT_CALL(*mock_dbus_thread_manager_, InitIBusBus(_, _))
-        .WillOnce(Invoke(this,
-                         &InputMethodEngineIBusBrowserTest::OnInitIBusBus));
   }
 
   virtual void TearDownInProcessBrowserTestFixture() OVERRIDE {
     DBusThreadManager::Shutdown();
   }
 
  protected:
   bool LoadExtensionWithType(const std::string& extension_name,
                              TestType type) {
     switch (type) {
       case kTestTypeNormal:
         return LoadExtension(test_data_dir_.AppendASCII(extension_name));
       case kTestTypeIncognito:
         return LoadExtensionIncognito(
             test_data_dir_.AppendASCII(extension_name));
       case kTestTypeComponent:
         return LoadExtensionAsComponent(
             test_data_dir_.AppendASCII(extension_name));
     }
     NOTREACHED();
     return false;
   }
 
-  void OnInitIBusBus(const std::string& ibus_address,
-                     const base::Closure& closure) {
-    dbus::Bus::Options options;
-    mock_bus_ = new dbus::MockBus(options);
-    EXPECT_CALL(*mock_dbus_thread_manager_, GetIBusBus())
-        .WillRepeatedly(Return(mock_bus_));
-  }
-
-  MockDBusThreadManager* mock_dbus_thread_manager_;
+  MockDBusThreadManagerWithoutGMock* mock_dbus_thread_manager_;
   scoped_refptr<dbus::MockBus> mock_bus_;
 };
 
 class KeyEventDoneCallback {
  public:
   explicit KeyEventDoneCallback(bool expected_argument)
       : expected_argument_(expected_argument),
         is_called_(false) {}
   ~KeyEventDoneCallback() {}
 
@@ skipping 106 matching lines @@
 
   // onDeactivated should be fired if Disable is called.
   ExtensionTestMessageListener disabled_listener("onDeactivated", false);
   engine_handler->Disable();
   ASSERT_TRUE(disabled_listener.WaitUntilSatisfied());
 }
 
 }  // namespace
 }  // namespace input_method
 }  // namespace chromeos