Fix chromeos=1 so Pulse is preferred when use_cras=0.

media/audio/cras/cras_unified.cc

 // Copyright 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 "media/audio/cras/cras_unified.h"
 
-#include <cras_client.h>
-
-#include "base/command_line.h"
 #include "base/logging.h"
-#include "media/audio/alsa/alsa_util.h"
 #include "media/audio/cras/audio_manager_cras.h"
 
 namespace media {
 
 // Overview of operation:
 // 1) An object of CrasUnifiedStream is created by the AudioManager
 // factory: audio_man->MakeAudioStream().
 // 2) Next some thread will call Open(), at that point a client is created and
 // configured for the correct format and sample rate.
 // 3) Then Start(source) is called and a stream is added to the CRAS client
@@ skipping 87 matching lines @@
   DCHECK(!is_playing_);
 }
 
 bool CrasUnifiedStream::Open() {
   // Sanity check input values.
   if (params_.sample_rate() <= 0) {
     LOG(WARNING) << "Unsupported audio frequency.";
     return false;
   }
 
-  if (alsa_util::BitsToFormat(params_.bits_per_sample()) ==
+  if (AudioManagerCras::BitsToFormat(params_.bits_per_sample()) ==
       SND_PCM_FORMAT_UNKNOWN) {
     LOG(WARNING) << "Unsupported pcm format";
     return false;
   }
 
   // Create the client and connect to the CRAS server.
   if (cras_client_create(&client_)) {
     LOG(WARNING) << "Couldn't create CRAS client.\n";
     client_ = NULL;
     return false;
@@ skipping 50 matching lines @@
 
   source_callback_ = callback;
 
   // Only start if we can enter the playing state.
   if (is_playing_)
     return;
 
   // Prepare |audio_format| and |stream_params| for the stream we
   // will create.
   cras_audio_format* audio_format = cras_audio_format_create(
-      alsa_util::BitsToFormat(params_.bits_per_sample()),
+      AudioManagerCras::BitsToFormat(params_.bits_per_sample()),
       params_.sample_rate(),
       params_.channels());
   if (!audio_format) {
     LOG(WARNING) << "Error setting up audio parameters.";
     callback->OnError(this);
     return;
   }
 
   // Initialize channel layout to all -1 to indicate that none of
   // the channels is set in the layout.
@@ skipping 190 matching lines @@
   return frames_filled;
 }
 
 void CrasUnifiedStream::NotifyStreamError(int err) {
   // This will remove the stream from the client.
   if (source_callback_)
     source_callback_->OnError(this);
 }
 
 }  // namespace media