| OLD | NEW |
| 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 "ash/test/ash_test_helper.h" | 5 #include "ash/test/ash_test_helper.h" |
| 6 | 6 |
| 7 #include "ash/accelerators/accelerator_controller_delegate_aura.h" | 7 #include "ash/accelerators/accelerator_controller_delegate_aura.h" |
| 8 #include "ash/common/ash_switches.h" | 8 #include "ash/common/ash_switches.h" |
| 9 #include "ash/common/material_design/material_design_controller.h" | 9 #include "ash/common/material_design/material_design_controller.h" |
| 10 #include "ash/common/test/material_design_controller_test_api.h" | 10 #include "ash/common/test/material_design_controller_test_api.h" |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 #if defined(OS_CHROMEOS) | 93 #if defined(OS_CHROMEOS) |
| 94 // Create DBusThreadManager for testing. | 94 // Create DBusThreadManager for testing. |
| 95 if (!chromeos::DBusThreadManager::IsInitialized()) { | 95 if (!chromeos::DBusThreadManager::IsInitialized()) { |
| 96 chromeos::DBusThreadManager::Initialize(); | 96 chromeos::DBusThreadManager::Initialize(); |
| 97 dbus_thread_manager_initialized_ = true; | 97 dbus_thread_manager_initialized_ = true; |
| 98 } | 98 } |
| 99 | 99 |
| 100 if (!bluez::BluezDBusManager::IsInitialized()) { | 100 if (!bluez::BluezDBusManager::IsInitialized()) { |
| 101 bluez::BluezDBusManager::Initialize( | 101 bluez::BluezDBusManager::Initialize( |
| 102 chromeos::DBusThreadManager::Get()->GetSystemBus(), | 102 chromeos::DBusThreadManager::Get()->GetSystemBus(), |
| 103 chromeos::DBusThreadManager::Get()->IsUsingStub( | 103 chromeos::DBusThreadManager::Get()->IsUsingFake( |
| 104 chromeos::DBusClientBundle::BLUETOOTH)); | 104 chromeos::DBusClientBundle::BLUETOOTH)); |
| 105 bluez_dbus_manager_initialized_ = true; | 105 bluez_dbus_manager_initialized_ = true; |
| 106 } | 106 } |
| 107 | 107 |
| 108 // Create CrasAudioHandler for testing since g_browser_process is not | 108 // Create CrasAudioHandler for testing since g_browser_process is not |
| 109 // created in AshTestBase tests. | 109 // created in AshTestBase tests. |
| 110 chromeos::CrasAudioHandler::InitializeForTesting(); | 110 chromeos::CrasAudioHandler::InitializeForTesting(); |
| 111 #endif | 111 #endif |
| 112 ash_test_environment_->SetUp(); | 112 ash_test_environment_->SetUp(); |
| 113 // Reset the global state for the cursor manager. This includes the | 113 // Reset the global state for the cursor manager. This includes the |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 218 bool AshTestHelper::SupportsHostWindowResize() { | 218 bool AshTestHelper::SupportsHostWindowResize() { |
| 219 #if defined(OS_WIN) | 219 #if defined(OS_WIN) |
| 220 return false; | 220 return false; |
| 221 #else | 221 #else |
| 222 return true; | 222 return true; |
| 223 #endif | 223 #endif |
| 224 } | 224 } |
| 225 | 225 |
| 226 } // namespace test | 226 } // namespace test |
| 227 } // namespace ash | 227 } // namespace ash |
| OLD | NEW |