cros: Enable new cras audio handler by default

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

 // Copyright (c) 2013 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/browser/chromeos/chrome_browser_main_chromeos.h"
 
 #include <string>
 #include <vector>
 
 #include "ash/ash_switches.h"
@@ skipping 255 matching lines @@
   // KioskAppLauncher deletes itself when done.
   (new KioskAppLauncher(
       KioskAppManager::Get()->GetAutoLaunchApp()))->Start();
 
   // Login screen is skipped but 'login-prompt-visible' signal is still needed.
   LOG(INFO) << "Kiosk app auto launch >> login-prompt-visible";
   chromeos::DBusThreadManager::Get()->GetSessionManagerClient()->
       EmitLoginPromptVisible();
 }
 
+bool UseNewAudioHandler() {
+  return !CommandLine::ForCurrentProcess()->
+      HasSwitch(ash::switches::kAshDisableNewAudioHandler);
+}
+
 }  // namespace
 
 namespace internal {
 
 // Wrapper class for initializing dbus related services and shutting them
 // down. This gets instantiated in a scoped_ptr so that shutdown methods in the
 // destructor will get called if and only if this has been instantiated.
 class DBusServices {
  public:
   explicit DBusServices(const content::MainFunctionParams& parameters)
@@ skipping 185 matching lines @@
 }
 
 // Threads are initialized between MainMessageLoopStart and MainMessageLoopRun.
 // about_flags settings are applied in ChromeBrowserMainParts::PreCreateThreads.
 void ChromeBrowserMainPartsChromeos::PreMainMessageLoopRun() {
   // TODO(rkc): Once the CrasAudioHandler is initialized by default, move
   // the code from CrasAudioSwitchHandler into it and remove this line.
   if (CommandLine::ForCurrentProcess()->HasSwitch(
       chromeos::switches::kEnableChromeAudioSwitching))
     CrasAudioSwitchHandler::Initialize();
-
-  if (CommandLine::ForCurrentProcess()->
-          HasSwitch(ash::switches::kAshEnableNewAudioHandler)) {
-   CrasAudioHandler::Initialize(
-       AudioPrefHandler::Create(g_browser_process->local_state()));
+  if (UseNewAudioHandler()) {
+    CrasAudioHandler::Initialize(
+        AudioPrefHandler::Create(g_browser_process->local_state()));
   } else {
    AudioHandler::Initialize(
        AudioPrefHandler::Create(g_browser_process->local_state()));
   }
 
   if (!StartupUtils::IsOobeCompleted())
     system::StatisticsProvider::GetInstance()->LoadOemManifest();
 
   base::FilePath downloads_directory;
   CHECK(PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &downloads_directory));
@@ skipping 291 matching lines @@
   peripheral_battery_observer_.reset();
 
   // The XInput2 event listener needs to be shut down earlier than when
   // Singletons are finally destroyed in AtExitManager.
   XInputHierarchyChangedEventListener::GetInstance()->Stop();
 
   // chromeos::SystemKeyEventListener::Shutdown() is always safe to call,
   // even if Initialize() wasn't called.
   SystemKeyEventListener::Shutdown();
   imageburner::BurnManager::Shutdown();
-  if (CommandLine::ForCurrentProcess()->
-          HasSwitch(ash::switches::kAshEnableNewAudioHandler)) {
+  if (UseNewAudioHandler()) {
     CrasAudioHandler::Shutdown();
   } else {
     AudioHandler::Shutdown();
   }
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(
       chromeos::switches::kEnableChromeAudioSwitching))
     CrasAudioSwitchHandler::Shutdown();
 
   WebSocketProxyController::Shutdown();
@@ skipping 80 matching lines @@
   trial->AppendGroup("4GB_RAM_4GB_swap", zram_group == '4' ? 1 : 0);
   trial->AppendGroup("4GB_RAM_6GB_swap", zram_group == '5' ? 1 : 0);
   trial->AppendGroup("snow_no_swap", zram_group == '6' ? 1 : 0);
   trial->AppendGroup("snow_1GB_swap", zram_group == '7' ? 1 : 0);
   trial->AppendGroup("snow_2GB_swap", zram_group == '8' ? 1 : 0);
   // This is necessary to start the experiment as a side effect.
   trial->group();
 }
 
 }  //  namespace chromeos