Fix static initializers in CrasAudioHandler.

chromeos/audio/cras_audio_handler.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 "chromeos/audio/cras_audio_handler.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 19 matching lines @@
 // Used when sound is unmuted, but volume was less than kMuteThresholdPercent.
 const int kDefaultUnmuteVolumePercent = 4;
 
 // Volume value which should be considered as muted in range [0, 100].
 const int kMuteThresholdPercent = 1;
 
 // The duration of HDMI output re-discover grace period in milliseconds.
 const int kHDMIRediscoverGracePeriodDurationInMs = 2000;
 
 // Mixer matrix, [0.5, 0.5; 0.5, 0.5]
-const std::vector<double> kStereoToMono = {0.5, 0.5, 0.5, 0.5};
+const double kStereoToMono[] = {0.5, 0.5, 0.5, 0.5};
 // Mixer matrix, [1, 0; 0, 1]
-const std::vector<double> kStereoToStereo = {1, 0, 0, 1};
+const double kStereoToStereo[] = {1, 0, 0, 1};
 
 static CrasAudioHandler* g_cras_audio_handler = nullptr;
 
 bool IsSameAudioDevice(const AudioDevice& a, const AudioDevice& b) {
   return a.stable_device_id == b.stable_device_id && a.is_input == b.is_input &&
          a.type == b.type && a.device_name == b.device_name;
 }
 
 bool IsDeviceInList(const AudioDevice& device, const AudioNodeList& node_list) {
   for (const AudioNode& node : node_list) {
@@ skipping 370 matching lines @@
       chromeos::DBusThreadManager::Get()->GetCrasAudioClient()->SwapLeftRight(
           device.id, swap);
       break;
     }
   }
 }
 
 void CrasAudioHandler::SetOutputMono(bool mono_on) {
   output_mono_on_ = mono_on;
   if (mono_on) {
-    chromeos::DBusThreadManager::Get()->GetCrasAudioClient()->
-        SetGlobalOutputChannelRemix(output_channels_, kStereoToMono);
+    chromeos::DBusThreadManager::Get()
+        ->GetCrasAudioClient()

[Lei Zhang, 2017/04/18 21:35:51]

BTW, this is clang-format rewriting code however it likes. I will do the cleanup
CL after this CL lands, and that will shorten this quite a bit.

[jennyz, 2017/04/18 21:46:13]

Acknowledged.

+        ->SetGlobalOutputChannelRemix(
+            output_channels_,
+            std::vector<double>(kStereoToMono, std::end(kStereoToMono)));
   } else {
-    chromeos::DBusThreadManager::Get()->GetCrasAudioClient()->
-        SetGlobalOutputChannelRemix(output_channels_, kStereoToStereo);
+    chromeos::DBusThreadManager::Get()
+        ->GetCrasAudioClient()
+        ->SetGlobalOutputChannelRemix(
+            output_channels_,
+            std::vector<double>(kStereoToStereo, std::end(kStereoToStereo)));
   }
 
   for (auto& observer : observers_)
     observer.OnOuputChannelRemixingChanged(mono_on);
 }
 
 bool CrasAudioHandler::IsOutputMonoEnabled() const {
   return output_mono_on_;
 }
 
@@ skipping 1138 matching lines @@
 bool CrasAudioHandler::HasExternalDevice(bool is_input) const {
   for (const auto& item : audio_devices_) {
     const AudioDevice& device = item.second;
     if (is_input == device.is_input && device.IsExternalDevice())
       return true;
   }
   return false;
 }
 
 }  // namespace chromeos