Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(59)

Side by Side Diff: chrome/test/base/testing_io_thread_state.cc

Issue 2338063002: chromeos: Refactor D-Bus client type enum and stub vs. fake naming (Closed)
Patch Set: review comments Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "chrome/test/base/testing_io_thread_state.h" 5 #include "chrome/test/base/testing_io_thread_state.h"
6 6
7 #include "base/location.h" 7 #include "base/location.h"
8 #include "base/run_loop.h" 8 #include "base/run_loop.h"
9 #include "base/single_thread_task_runner.h" 9 #include "base/single_thread_task_runner.h"
10 #include "base/threading/thread_task_runner_handle.h" 10 #include "base/threading/thread_task_runner_handle.h"
11 #include "base/time/tick_clock.h" 11 #include "base/time/tick_clock.h"
12 #include "build/build_config.h" 12 #include "build/build_config.h"
13 #include "chrome/browser/io_thread.h" 13 #include "chrome/browser/io_thread.h"
14 #include "chrome/test/base/testing_browser_process.h" 14 #include "chrome/test/base/testing_browser_process.h"
15 #include "content/public/browser/browser_thread.h" 15 #include "content/public/browser/browser_thread.h"
16 16
17 #if defined(OS_CHROMEOS) 17 #if defined(OS_CHROMEOS)
18 #include "chromeos/dbus/dbus_client_types.h"
18 #include "chromeos/dbus/dbus_thread_manager.h" 19 #include "chromeos/dbus/dbus_thread_manager.h"
19 #include "chromeos/network/network_handler.h" 20 #include "chromeos/network/network_handler.h"
20 #include "device/bluetooth/dbus/bluez_dbus_manager.h" 21 #include "device/bluetooth/dbus/bluez_dbus_manager.h"
21 #endif 22 #endif
22 23
23 using content::BrowserThread; 24 using content::BrowserThread;
24 25
25 namespace { 26 namespace {
26 27
27 base::Closure ThreadSafeQuit(base::RunLoop* run_loop) { 28 base::Closure ThreadSafeQuit(base::RunLoop* run_loop) {
(...skipping 11 matching lines...) Expand all
39 } // namespace 40 } // namespace
40 41
41 namespace chrome { 42 namespace chrome {
42 43
43 TestingIOThreadState::TestingIOThreadState() { 44 TestingIOThreadState::TestingIOThreadState() {
44 #if defined(OS_CHROMEOS) 45 #if defined(OS_CHROMEOS)
45 // Needed by IOThread constructor. 46 // Needed by IOThread constructor.
46 chromeos::DBusThreadManager::Initialize(); 47 chromeos::DBusThreadManager::Initialize();
47 bluez::BluezDBusManager::Initialize( 48 bluez::BluezDBusManager::Initialize(
48 chromeos::DBusThreadManager::Get()->GetSystemBus(), 49 chromeos::DBusThreadManager::Get()->GetSystemBus(),
49 chromeos::DBusThreadManager::Get()->IsUsingStub( 50 chromeos::DBusThreadManager::Get()->IsUsingFake(
50 chromeos::DBusClientBundle::BLUETOOTH)); 51 chromeos::DBusClientType::BLUETOOTH));
51 chromeos::NetworkHandler::Initialize(); 52 chromeos::NetworkHandler::Initialize();
52 #endif 53 #endif
53 54
54 io_thread_state_.reset( 55 io_thread_state_.reset(
55 new IOThread(TestingBrowserProcess::GetGlobal()->local_state(), 56 new IOThread(TestingBrowserProcess::GetGlobal()->local_state(),
56 TestingBrowserProcess::GetGlobal()->policy_service(), 57 TestingBrowserProcess::GetGlobal()->policy_service(),
57 NULL, NULL)); 58 NULL, NULL));
58 59
59 // Safe because there are no virtuals. 60 // Safe because there are no virtuals.
60 base::RunLoop run_loop; 61 base::RunLoop run_loop;
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 97
97 void TestingIOThreadState::Shutdown(const base::Closure& done) { 98 void TestingIOThreadState::Shutdown(const base::Closure& done) {
98 DCHECK_CURRENTLY_ON(BrowserThread::IO); 99 DCHECK_CURRENTLY_ON(BrowserThread::IO);
99 100
100 delete io_thread_state_->globals(); 101 delete io_thread_state_->globals();
101 io_thread_state_->SetGlobalsForTesting(NULL); 102 io_thread_state_->SetGlobalsForTesting(NULL);
102 done.Run(); 103 done.Run();
103 } 104 }
104 105
105 } // namespace chrome 106 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698