cros: Enable new cras audio handler by default

chrome/test/base/view_event_test_base.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/test/base/view_event_test_base.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/message_loop.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 21 matching lines @@
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/aura_test_helper.h"
 #endif
 
 #if defined(OS_WIN)
 #include "base/win/metro.h"
 #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.
 class TestView : public views::View {
  public:
   TestView() {}
 
   void SetPreferredSize(const gfx::Size& size) {
     preferred_size_ = size;
     PreferredSizeChanged();
@@ skipping 53 matching lines @@
   // http://crbug.com/154081 use ash::Shell code path below on win_ash bots when
   // interactive_ui_tests is brought up on that platform.
   gfx::Screen::SetScreenInstance(
       gfx::SCREEN_TYPE_NATIVE, views::CreateDesktopScreen());
 #else
 #if defined(ENABLE_MESSAGE_CENTER)
   // Ash Shell can't just live on its own without a browser process, we need to
   // 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
 #elif defined(USE_AURA)
   // Instead of using the ash shell, use an AuraTestHelper to create and manage
   // the test screen.
   aura_test_helper_.reset(new aura::test::AuraTestHelper(&message_loop_));
   aura_test_helper_->SetUp();
   context = aura_test_helper_->root_window();
 #endif
@@ skipping 11 matching lines @@
 #else
     window_->Close();
     content::RunAllPendingInMessageLoop();
 #endif
     window_ = NULL;
   }
 #if defined(USE_ASH)
 #if defined(OS_WIN)
 #else
   ash::Shell::DeleteInstance();
 #if defined(ENABLE_MESSAGE_CENTER)

[James Cook, 2013/04/30 20:55:05]

Don't you need to shutdown the CrasAudioHandler?

[rkc, 2013/04/30 23:04:57]

Don't really need to, but should - otherwise ASAN will probably complain.
Done.

   // Ash Shell can't just live on its own without a browser process, we need to
   // also shut down the message center.
   message_center::MessageCenter::Shutdown();
 #endif
   aura::Env::DeleteInstance();
 #endif
 #elif defined(USE_AURA)
   aura_test_helper_->TearDown();
 #endif
   ui::CompositorTestSupport::Terminate();
@@ skipping 62 matching lines @@
   dnd_thread_.reset(NULL);
 }
 
 void ViewEventTestBase::RunTestMethod(const base::Closure& task) {
   StopBackgroundThread();
 
   task.Run();
   if (HasFatalFailure())
     Done();
 }