cros: Enable new cras audio handler by default

chrome/browser/policy/policy_browsertest.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 <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 101 matching lines @@
 #include "webkit/plugins/npapi/plugin_utils.h"
 #include "webkit/plugins/plugin_constants.h"
 #include "webkit/plugins/webplugininfo.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/accelerators/accelerator_table.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "chrome/browser/chromeos/audio/audio_handler.h"
+#include "chromeos/audio/audio_pref_handler.h"
 #endif
 
 using content::BrowserThread;
 using content::URLRequestMockHTTPJob;
 using testing::AnyNumber;
 using testing::Mock;
 using testing::Return;
 using testing::_;
 
 namespace policy {
@@ skipping 1504 matching lines @@
 
   // Make sure screenshots are counted correctly.
   TestScreenshotFile(true);
   ASSERT_EQ(CountScreenshots(), screenshot_count + 1);
 
   // Check if trying to take a screenshot fails when disabled by policy.
   TestScreenshotFile(false);
   ASSERT_EQ(CountScreenshots(), screenshot_count + 1);
 }
 
-IN_PROC_BROWSER_TEST_F(PolicyTest, DisableAudioOutput) {
+// TODO(rkc,jennyz): Fix this once we remove the old Audio Handler completely.
+IN_PROC_BROWSER_TEST_F(PolicyTest, DISABLED_DisableAudioOutput) {
   // Set up the mock observer.
+  chromeos::AudioHandler::Initialize(

[James Cook, 2013/04/30 23:31:21]

Do you still want this if you are disabling the test?

[rkc, 2013/04/30 23:36:37]

Without it the test crashes. I'd rather have a failing test checked in than a
crashing one.

+      chromeos::AudioPrefHandler::Create(g_browser_process->local_state()));
   chromeos::AudioHandler* audio_handler = chromeos::AudioHandler::GetInstance();
   scoped_ptr<TestVolumeObserver> mock(new TestVolumeObserver());
   audio_handler->AddVolumeObserver(mock.get());
 
   bool prior_state = audio_handler->IsMuted();
   // Make sure we are not muted and then toggle the policy and observe if the
   // trigger was successful.
   audio_handler->SetMuted(false);
   EXPECT_FALSE(audio_handler->IsMuted());
   EXPECT_CALL(*mock, OnMuteToggled()).Times(1);
@@ skipping 12 matching lines @@
                POLICY_SCOPE_USER, base::Value::CreateBooleanValue(true));
   UpdateProviderPolicy(policies);
   EXPECT_FALSE(audio_handler->IsMuted());
   EXPECT_CALL(*mock, OnMuteToggled()).Times(1);
   audio_handler->SetMuted(true);
   EXPECT_TRUE(audio_handler->IsMuted());
   // Revert the prior state.
   EXPECT_CALL(*mock, OnMuteToggled()).Times(1);
   audio_handler->SetMuted(prior_state);
   audio_handler->RemoveVolumeObserver(mock.get());
+  chromeos::AudioHandler::Shutdown();
 }
 
 IN_PROC_BROWSER_TEST_F(PolicyTest, PRE_SessionLengthLimit) {
   // Set the session start time to 2 hours ago.
   g_browser_process->local_state()->SetInt64(
       prefs::kSessionStartTime,
       (base::TimeTicks::Now() - base::TimeDelta::FromHours(2))
           .ToInternalValue());
 }
 
@@ skipping 374 matching lines @@
           GetDefaultVariationsServerURLForTesting();
 
   // Policy is applied and pref is already updated in local state.
   EXPECT_EQ(default_variations_url + "?restrict=restricted",
             chrome_variations::VariationsService::GetVariationsServerURL(
                 g_browser_process->local_state()).spec());
 }
 #endif
 
 }  // namespace policy