Revert of Make more media APIs aware of |delay| and |delay_timestamp|

media/audio/audio_output_controller_unittest.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/audio_output_controller.h"
 
 #include <stdint.h>
 
 #include <memory>
 #include <vector>
@@ skipping 44 matching lines @@
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockAudioOutputControllerEventHandler);
 };
 
 class MockAudioOutputControllerSyncReader
     : public AudioOutputController::SyncReader {
  public:
   MockAudioOutputControllerSyncReader() {}
 
-  MOCK_METHOD3(RequestMoreData,
-               void(base::TimeDelta delay,
-                    base::TimeTicks delay_timestamp,
-                    int prior_frames_skipped));
+  MOCK_METHOD2(UpdatePendingBytes,
+               void(uint32_t bytes, uint32_t frames_skipped));
   MOCK_METHOD1(Read, void(AudioBus* dest));
   MOCK_METHOD0(Close, void());
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockAudioOutputControllerSyncReader);
 };
 
 class MockAudioOutputStream : public AudioOutputStream {
  public:
   MOCK_METHOD0(Open, bool());
@@ skipping 58 matching lines @@
     EXPECT_EQ(params_.IsValid(), controller_.get() != NULL);
     base::RunLoop().RunUntilIdle();
   }
 
   void Play() {
     // Expect the event handler to receive one OnPlaying() call.
     EXPECT_CALL(mock_event_handler_, OnPlaying());
 
     // During playback, the mock pretends to provide audio data rendered and
     // sent from the render process.
-    EXPECT_CALL(mock_sync_reader_, RequestMoreData(_, _, _)).Times(AtLeast(1));
+    EXPECT_CALL(mock_sync_reader_, UpdatePendingBytes(_, _)).Times(AtLeast(1));
     EXPECT_CALL(mock_sync_reader_, Read(_)).WillRepeatedly(PopulateBuffer());
     controller_->Play();
     base::RunLoop().RunUntilIdle();
   }
 
   void Pause() {
     // Expect the event handler to receive one OnPaused() call.
     EXPECT_CALL(mock_event_handler_, OnPaused());
 
     controller_->Pause();
@@ skipping 273 matching lines @@
   // Switching device would trigger a read, and in turn it would trigger a push
   // to sink.
   EXPECT_CALL(mock_sink, OnDataCheck(kBufferNonZeroData));
   SwitchDevice(false);
 
   StopDuplicating(&mock_sink);
   Close();
 }
 
 }  // namespace media