Refactored DecoderBuffer to use unix_hacker_style naming.

media/base/android/media_source_player_unittest.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 <string>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "media/base/android/media_codec_bridge.h"
 #include "media/base/android/media_player_manager.h"
@@ skipping 91 matching lines @@
   // Starts an audio decoder job.
   void StartAudioDecoderJob() {
     MediaPlayerHostMsg_DemuxerReady_Params params;
     params.audio_codec = kCodecVorbis;
     params.audio_channels = 2;
     params.audio_sampling_rate = 44100;
     params.is_audio_encrypted = false;
     params.duration_ms = kDefaultDurationInMs;
     scoped_refptr<DecoderBuffer> buffer = ReadTestDataFile("vorbis-extradata");
     params.audio_extra_data = std::vector<uint8>(
-        buffer->GetData(),
-        buffer->GetData() + buffer->GetDataSize());
+        buffer->data(),
+        buffer->data() + buffer->data_size());
     Start(params);
   }
 
   void StartVideoDecoderJob() {
     MediaPlayerHostMsg_DemuxerReady_Params params;
     params.video_codec = kCodecVP8;
     params.video_size = gfx::Size(320, 240);
     params.is_video_encrypted = false;
     params.duration_ms = kDefaultDurationInMs;
     Start(params);
   }
 
   // Starts decoding the data.
   void Start(const MediaPlayerHostMsg_DemuxerReady_Params& params) {
     player_->DemuxerReady(params);
     player_->Start();
   }
 
   MediaPlayerHostMsg_ReadFromDemuxerAck_Params
       CreateReadFromDemuxerAckForAudio() {
     MediaPlayerHostMsg_ReadFromDemuxerAck_Params ack_params;
     ack_params.type = DemuxerStream::AUDIO;
     ack_params.access_units.resize(1);
     ack_params.access_units[0].status = DemuxerStream::kOk;
     scoped_refptr<DecoderBuffer> buffer = ReadTestDataFile("vorbis-packet-0");
     ack_params.access_units[0].data = std::vector<uint8>(
-        buffer->GetData(), buffer->GetData() + buffer->GetDataSize());
+        buffer->data(), buffer->data() + buffer->data_size());
     // Vorbis needs 4 extra bytes padding on Android to decode properly. Check
     // NuMediaExtractor.cpp in Android source code.
     uint8 padding[4] = { 0xff , 0xff , 0xff , 0xff };
     ack_params.access_units[0].data.insert(
         ack_params.access_units[0].data.end(), padding, padding + 4);
     return ack_params;
   }
 
   MediaPlayerHostMsg_ReadFromDemuxerAck_Params
         CreateReadFromDemuxerAckForVideo() {
     MediaPlayerHostMsg_ReadFromDemuxerAck_Params ack_params;
     ack_params.type = DemuxerStream::VIDEO;
     ack_params.access_units.resize(1);
     ack_params.access_units[0].status = DemuxerStream::kOk;
     scoped_refptr<DecoderBuffer> buffer =
         ReadTestDataFile("vp8-I-frame-320x240");
     ack_params.access_units[0].data = std::vector<uint8>(
-        buffer->GetData(), buffer->GetData() + buffer->GetDataSize());
+        buffer->data(), buffer->data() + buffer->data_size());
     return ack_params;
   }
 
   base::TimeTicks StartTimeTicks() {
     return player_->start_time_ticks_;
   }
 
  protected:
   scoped_ptr<MockMediaPlayerManager> manager_;
   scoped_ptr<MediaSourcePlayer> player_;
@@ skipping 185 matching lines @@
 
   // Test that when Start() is called, video decoder jobs will wait for audio
   // decoder job before start decoding the data.
   MediaPlayerHostMsg_DemuxerReady_Params params;
   params.audio_codec = kCodecVorbis;
   params.audio_channels = 2;
   params.audio_sampling_rate = 44100;
   params.is_audio_encrypted = false;
   scoped_refptr<DecoderBuffer> buffer = ReadTestDataFile("vorbis-extradata");
   params.audio_extra_data = std::vector<uint8>(
-      buffer->GetData(),
-      buffer->GetData() + buffer->GetDataSize());
+      buffer->data(),
+      buffer->data() + buffer->data_size());
   params.video_codec = kCodecVP8;
   params.video_size = gfx::Size(320, 240);
   params.is_video_encrypted = false;
   params.duration_ms = kDefaultDurationInMs;
   Start(params);
   EXPECT_EQ(0, manager_->num_requests());
 
   scoped_refptr<gfx::SurfaceTextureBridge> surface_texture(
       new gfx::SurfaceTextureBridge(0));
   gfx::ScopedJavaSurface surface(surface_texture.get());
@@ skipping 38 matching lines @@
   base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(100));
   manager_->message_loop()->RunUntilIdle();
 
   // Send new data to the decoder. This should reset the start time ticks.
   player_->ReadFromDemuxerAck(CreateReadFromDemuxerAckForAudio());
   base::TimeTicks current = StartTimeTicks();
   EXPECT_LE(100.0, (current - previous).InMillisecondsF());
 }
 
 }  // namespace media