| OLD | NEW | 
|   1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |   1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 
|   2 // Use of this source code is governed by a BSD-style license that can be |   2 // Use of this source code is governed by a BSD-style license that can be | 
|   3 // found in the LICENSE file. |   3 // found in the LICENSE file. | 
|   4  |   4  | 
|   5 #include "base/at_exit.h" |   5 #include "base/at_exit.h" | 
|   6 #include "base/command_line.h" |   6 #include "base/command_line.h" | 
|   7 #include "base/test/test_timeouts.h" |   7 #include "base/test/test_timeouts.h" | 
|   8 #include "dbus/bus.h" |   8 #include "dbus/bus.h" | 
|   9 #include "dbus/test_service.h" |   9 #include "dbus/test_service.h" | 
|  10  |  10  | 
|  11 int main(int argc, char** argv) { |  11 int main(int argc, char** argv) { | 
|  12   base::AtExitManager exit_manager; |  12   base::AtExitManager exit_manager; | 
|  13   CommandLine::Init(argc, argv); |  13   CommandLine::Init(argc, argv); | 
|  14   TestTimeouts::Initialize(); |  14   TestTimeouts::Initialize(); | 
|  15  |  15  | 
|  16   base::Thread* dbus_thread = new base::Thread("D-Bus Thread"); |  16   base::Thread* dbus_thread = new base::Thread("D-Bus Thread"); | 
|  17   base::Thread::Options thread_options; |  17   base::Thread::Options thread_options; | 
|  18   thread_options.message_loop_type = MessageLoop::TYPE_IO; |  18   thread_options.message_loop_type = MessageLoop::TYPE_IO; | 
|  19   CHECK(dbus_thread->StartWithOptions(thread_options)); |  19   CHECK(dbus_thread->StartWithOptions(thread_options)); | 
|  20  |  20  | 
|  21   dbus::TestService::Options options; |  21   dbus::TestService::Options options; | 
|  22   options.dbus_thread_message_loop_proxy = dbus_thread->message_loop_proxy(); |  22   options.dbus_task_runner = dbus_thread->message_loop_proxy(); | 
|  23   dbus::TestService* test_service = new dbus::TestService(options); |  23   dbus::TestService* test_service = new dbus::TestService(options); | 
|  24   CHECK(test_service->StartService()); |  24   CHECK(test_service->StartService()); | 
|  25   CHECK(test_service->WaitUntilServiceIsStarted()); |  25   CHECK(test_service->WaitUntilServiceIsStarted()); | 
|  26   CHECK(test_service->HasDBusThread()); |  26   CHECK(test_service->HasDBusThread()); | 
|  27   base::PlatformThread::Join(dbus_thread->thread_handle()); |  27   base::PlatformThread::Join(dbus_thread->thread_handle()); | 
|  28 } |  28 } | 
| OLD | NEW |