Clean up histogram'd media enum max values.

media/audio/pulse/pulse_util.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 "media/audio/pulse/pulse_util.h"
 
 #include "base/logging.h"
 #include "base/time/time.h"
 #include "media/audio/audio_manager_base.h"
 #include "media/audio/audio_parameters.h"
@@ skipping 23 matching lines @@
     case LEFT_OF_CENTER:
       return PA_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER;
     case RIGHT_OF_CENTER:
       return PA_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER;
     case BACK_CENTER:
       return PA_CHANNEL_POSITION_REAR_CENTER;
     case SIDE_LEFT:
       return PA_CHANNEL_POSITION_SIDE_LEFT;
     case SIDE_RIGHT:
       return PA_CHANNEL_POSITION_SIDE_RIGHT;
-    case CHANNELS_MAX:
+    case CHANNELS_HISTOGRAM_MAX:
       return PA_CHANNEL_POSITION_INVALID;
     default:

[scherkus (not reviewing), 2014/01/27 22:37:31]

can you remove the default here?

       NOTREACHED() << "Invalid channel: " << channel;
       return PA_CHANNEL_POSITION_INVALID;
   }
 }
 
 }  // namespace
 
 // static, pa_stream_success_cb_t
 void StreamSuccessCallback(pa_stream* s, int error, void* mainloop) {
   pa_threaded_mainloop* pa_mainloop =
@@ skipping 22 matching lines @@
       NOTREACHED() << "Invalid bits per sample: " << bits_per_sample;
       return PA_SAMPLE_INVALID;
   }
 }
 
 pa_channel_map ChannelLayoutToPAChannelMap(ChannelLayout channel_layout) {
   pa_channel_map channel_map;
   pa_channel_map_init(&channel_map);
 
   channel_map.channels = ChannelLayoutToChannelCount(channel_layout);
-  for (Channels ch = LEFT; ch < CHANNELS_MAX;
+  for (Channels ch = LEFT; ch < CHANNELS_HISTOGRAM_MAX;
        ch = static_cast<Channels>(ch + 1)) {
     int channel_index = ChannelOrder(channel_layout, ch);
     if (channel_index < 0)
       continue;
 
     channel_map.map[channel_index] = ChromiumToPAChannelPosition(ch);
   }
 
   return channel_map;
 }
@@ skipping 206 matching lines @@
   }
 
   return true;
 }
 
 #undef RETURN_ON_FAILURE
 
 }  // namespace pulse
 
 }  // namespace media