Merge from Chromium at DEPS revision r190564

This commit was generated by merge_to_master.py.

Change-Id: Icadecbce29854b8fa25fd335b2c1949b5ca5d170

1 files changed, 4 insertions, 2 deletions

diff --git a/media/base/audio_bus.h b/media/base/audio_bus.h
index 49bed82e90..9d9563c1d2 100644
--- a/media/base/audio_bus.h
+++ b/media/base/audio_bus.h
@@ -62,6 +62,8 @@ class MEDIA_EXPORT AudioBus {
   // any unfilled frames when |frames| is less than frames().
   void FromInterleaved(const void* source, int frames, int bytes_per_sample);
   void ToInterleaved(int frames, int bytes_per_sample, void* dest) const;
+  void ToInterleavedPartial(int start_frame, int frames, int bytes_per_sample,
+                            void* dest) const;
 
   // Similar to FromInterleaved() above, but meant for streaming sources.  Does
   // not zero out remaining frames, the caller is responsible for doing so using
@@ -81,7 +83,7 @@ class MEDIA_EXPORT AudioBus {
   const float* channel(int channel) const { return channel_data_[channel]; }
   void SetChannelData(int channel, float* data);
 
-  int channels() const { return channel_data_.size(); }
+  int channels() const { return static_cast<int>(channel_data_.size()); }
   int frames() const { return frames_; }
   void set_frames(int frames);
 
@@ -91,7 +93,7 @@ class MEDIA_EXPORT AudioBus {
   void ZeroFramesPartial(int start_frame, int frames);
 
  private:
-  friend class scoped_ptr<AudioBus>;
+  friend struct base::DefaultDeleter<AudioBus>;
   ~AudioBus();
 
   AudioBus(int channels, int frames);