Revert 198975 "Add unit tests for ibus-daemon connection and com..."

> Add unit tests for ibus-daemon connection and component extension ime initialization.
> 
> With this change, ui_unittests is also need update.
> We can't call or even check the call count of IBusClient/IBUsInputContextClient stuff before InitIBusBus.
> 
> 
> BUG=None
> TEST=ran unit_tests both Release/Debug configuration.
> 
> Review URL: https://chromiumcodereview.appspot.com/14845003

This caused crashes on chromeos bot. Here's one:

(view as text)
InputMethodEngineIBusBrowserTest/InputMethodEngineIBusBrowserTest.BasicScenarioTest/0: 
[22041:22041:0508/140628:1430259270:WARNING:chrome_browser_main_chromeos.cc(471)]
Using new connection change notifier.
[22041:22041:0508/140628:1430274664:ERROR:nss_util.cc(492)] Error
initializing NSS with a persistent database
(sql:/etc/fake_root_ca/nssdb): NSS error code: -8174
[22041:22041:0508/140628:1430354911:ERROR:mock_dbus_thread_manager_without_gmock.cc(126)]
Not implemented reached in virtual chromeos::CrasAudioClient*
chromeos::MockDBusThreadManagerWithoutGMock::GetCrasAudioClient()
[22041:22041:0508/140628:1430366346:INFO:profile_helper.cc(93)]
Switching to custom profile_dir: user
Xlib:  extension "RANDR" missing on display ":9".
[22041:22041:0508/140628:1430402274:ERROR:mock_dbus_thread_manager_without_gmock.cc(126)]
Not implemented reached in virtual chromeos::CrasAudioClient*
chromeos::MockDBusThreadManagerWithoutGMock::GetCrasAudioClient()
[22041:22041:0508/140628:1430407258:ERROR:component_loader.cc(118)]
Failed to parse extension manifest.
[7:7:0508/140628:WARNING:sandbox_linux.cc(37)] Activated seccomp-bpf
sandbox for process type: renderer.
[22073:22073:0508/140628:ERROR:nss_util.cc(492)] Error initializing
NSS with a persistent database (sql:/etc/fake_root_ca/nssdb): NSS
error code: -8174
[22073:22073:0508/140628:ERROR:gl_surface_glx.cc(326)] glxQueryVersion
failed
[22073:22073:0508/140628:ERROR:gl_surface_x11.cc(58)]
GLSurfaceGLX::InitializeOneOff failed.
[22073:22073:0508/140628:WARNING:sandbox_linux.cc(37)] Activated
seccomp-bpf sandbox for process type: gpu-process.
Received signal 11 SEGV_MAPERR 000000000018
[0x7fdd496251fe] base::debug::StackTrace::StackTrace()
[0x7fdd49625728] base::debug::(anonymous
namespace)::StackDumpSignalHandler()
[0x7fdd41bcdcb0] <unknown>
[0x00000060eaaf] chromeos::input_method::(anonymous
namespace)::InputMethodEngineIBusBrowserTest_BasicScenarioTest_Test::RunTestOnMainThread()
[0x00000177f539] InProcessBrowserTest::RunTestOnMainThreadLoop()
[0x00000272edee] ChromeBrowserMainParts::PreMainMessageLoopRunImpl()
[0x00000272fa69] ChromeBrowserMainParts::PreMainMessageLoopRun()
[0x00000214e9b4]
chromeos::ChromeBrowserMainPartsChromeos::PreMainMessageLoopRun()
[0x7fdd46a2029f] content::BrowserMainLoop::CreateThreads()
[0x7fdd46a21a12] content::BrowserMainRunnerImpl::Initialize()
[0x7fdd46a1d0e7] content::BrowserMain()
[0x00000252a58a] content::BrowserTestBase::SetUp()
[0x00000177ed1b] InProcessBrowserTest::SetUp()
[0x00000180236a] testing::Test::Run()
[0x0000018024aa] testing::TestInfo::Run()
[0x0000018025ef] testing::TestCase::Run()
[0x00000180287f] testing::internal::UnitTestImpl::RunAllTests()
[0x0000017fd413] testing::UnitTest::Run()
[0x00000179997e] base::TestSuite::Run()
[0x000000ecaba5] ChromeTestLauncherDelegate::RunTestSuite()
[0x0000025651e3] content::LaunchTests()
[0x000000ecabfd] main
[0x7fdd408fb76d] __libc_start_main
[0x000000504029] <unknown>
r8: 00007fdd3cba8d70  r9: 0000000000005619 r10: 00000000034fd140 r11:
0000000000000000
r12: 0000000000000000 r13: 00001beaabee2340 r14: 00007fdd3cb02230 r15:
00007fdd496f0224
di: 00001beaabee2348  si: 00001beaabee2340  bp: 00007fdd3cafee40  bx:
00001beaabee2340
dx: 000000000060bfe0  ax: 0000000000000001  cx: 000000000060c040  sp:
00007fffddced580
ip: 000000000060eaaf efl: 0000000000010202 cgf: 0000000000000033 erf:
0000000000000004
trp: 000000000000000e msk: 0000000000000000 cr2: 0000000000000018
Starting tests...
IMPORTANT DEBUGGING NOTE: each test is run inside its own process.
For debugging a test inside a debugger, use the
--gtest_filter=<your_test_name> flag along with either
--single_process (to run the test in one launcher/browser process) or
--single-process (to do the above, and also run Chrome in
single-process mode).
1 test run
1 test failed (0 ignored)
Failing tests:
InputMethodEngineIBusBrowserTest/InputMethodEngineIBusBrowserTest.BasicScenarioTest/0


TBR=nona@chromium.org

Review URL: https://codereview.chromium.org/15067005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199031 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 7 deletions

diff --git a/chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc b/chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc
index 96e5609..4658db9 100644
--- a/chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc
+++ b/chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc
@@ -52,6 +52,12 @@ MockDBusThreadManagerWithoutGMock::MockDBusThreadManagerWithoutGMock()
     fake_old_bluetooth_manager_client_(new FakeOldBluetoothManagerClient),
     fake_old_bluetooth_adapter_client_(new FakeOldBluetoothAdapterClient),
     fake_old_bluetooth_device_client_(new FakeOldBluetoothDeviceClient),
+    mock_ibus_client_(new MockIBusClient),
+    mock_ibus_config_client_(new MockIBusConfigClient),
+    mock_ibus_input_context_client_(new MockIBusInputContextClient),
+    mock_ibus_engine_service_(new MockIBusEngineService),
+    mock_ibus_engine_factory_service_(new MockIBusEngineFactoryService),
+    mock_ibus_panel_service_(new MockIBusPanelService),
     ibus_bus_(NULL) {
   power_policy_controller_.reset(
       new PowerPolicyController(this, fake_power_manager_client_.get()));
@@ -79,12 +85,6 @@ void MockDBusThreadManagerWithoutGMock::InitIBusBus(
     const base::Closure& closure) {
   // Non-null bus address is used to ensure the connection to ibus-daemon.
   ibus_bus_ = reinterpret_cast<dbus::Bus*>(0xdeadbeef);
-  mock_ibus_client_.reset(new MockIBusClient);
-  mock_ibus_config_client_.reset(new MockIBusConfigClient);
-  mock_ibus_input_context_client_.reset(new MockIBusInputContextClient);
-  mock_ibus_engine_service_.reset(new MockIBusEngineService);
-  mock_ibus_engine_factory_service_.reset(new MockIBusEngineFactoryService);
-  mock_ibus_panel_service_.reset(new MockIBusPanelService);
 }
 
 dbus::Bus* MockDBusThreadManagerWithoutGMock::GetSystemBus() {
@@ -181,7 +181,7 @@ ShillIPConfigClient*
 
 ShillManagerClient*
     MockDBusThreadManagerWithoutGMock::GetShillManagerClient() {
-  return fake_shill_manager_client_.get();
+  return fake_shill_manager_client_.get();;
 }
 
 ShillProfileClient*