| Index: chrome/test/base/view_event_test_base.cc
|
| diff --git a/chrome/test/base/view_event_test_base.cc b/chrome/test/base/view_event_test_base.cc
|
| index 6b0bbe581a516ace074907ea077e997ebf969263..240f63fb098183ab7756b7b04175660902c9fbda 100644
|
| --- a/chrome/test/base/view_event_test_base.cc
|
| +++ b/chrome/test/base/view_event_test_base.cc
|
| @@ -39,6 +39,10 @@
|
| #include "ui/base/ime/win/tsf_bridge.h"
|
| #endif
|
|
|
| +#if defined(OS_CHROMEOS)
|
| +#include "chromeos/audio/cras_audio_handler.h"
|
| +#endif
|
| +
|
| namespace {
|
|
|
| // View subclass that allows you to specify the preferred size.
|
| @@ -112,6 +116,9 @@ void ViewEventTestBase::SetUp() {
|
| // also create the message center.
|
| message_center::MessageCenter::Initialize();
|
| #endif
|
| +#if defined(OS_CHROMEOS)
|
| + chromeos::CrasAudioHandler::InitializeForTesting();
|
| +#endif
|
| ash::Shell::CreateInstance(new ash::test::TestShellDelegate());
|
| context = ash::Shell::GetPrimaryRootWindow();
|
| #endif
|
| @@ -143,6 +150,9 @@ void ViewEventTestBase::TearDown() {
|
| #if defined(OS_WIN)
|
| #else
|
| ash::Shell::DeleteInstance();
|
| +#if defined(OS_CHROMEOS)
|
| + chromeos::CrasAudioHandler::Shutdown();
|
| +#endif
|
| #if defined(ENABLE_MESSAGE_CENTER)
|
| // Ash Shell can't just live on its own without a browser process, we need to
|
| // also shut down the message center.
|
|
|