Speech refactoring: Turned AudioChunk into a refcounted class (CL1.4)

content/browser/speech/google_one_shot_remote_engine.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 "content/browser/speech/google_one_shot_remote_engine.h"
 
 #include <vector>
 
 #include "base/json/json_reader.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "content/browser/speech/audio_buffer.h"
 #include "content/common/net/url_fetcher_impl.h"
 #include "content/public/common/speech_recognition_error.h"
 #include "content/public/common/speech_recognition_result.h"
 #include "net/base/escape.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_request_context.h"
@@ skipping 214 matching lines @@
 
 void GoogleOneShotRemoteEngine::EndRecognition() {
   url_fetcher_.reset();
 }
 
 void GoogleOneShotRemoteEngine::TakeAudioChunk(const AudioChunk& data) {
   DCHECK(url_fetcher_.get());
   DCHECK(encoder_.get());
   DCHECK_EQ(data.bytes_per_sample(), config_.audio_num_bits_per_sample / 8);
   encoder_->Encode(data);
-  scoped_ptr<AudioChunk> encoded_data(encoder_->GetEncodedDataAndClear());
+  scoped_refptr<AudioChunk> encoded_data(encoder_->GetEncodedDataAndClear());
   url_fetcher_->AppendChunkToUpload(encoded_data->AsString(), false);
 }
 
 void GoogleOneShotRemoteEngine::AudioChunksEnded() {
   DCHECK(url_fetcher_.get());
   DCHECK(encoder_.get());
 
   // UploadAudioChunk requires a non-empty final buffer. So we encode a packet
   // of silence in case encoder had no data already.
   std::vector<int16> samples(
       config_.audio_sample_rate * kAudioPacketIntervalMs / 1000);
-  AudioChunk dummy_chunk(reinterpret_cast<uint8*>(&samples[0]),
-                         samples.size() * sizeof(int16),
-                         encoder_->bits_per_sample() / 8);
-  encoder_->Encode(dummy_chunk);
+  scoped_refptr<AudioChunk> dummy_chunk(
+      new AudioChunk(reinterpret_cast<uint8*>(&samples[0]),
+                     samples.size() * sizeof(int16),
+                     encoder_->bits_per_sample() / 8));
+  encoder_->Encode(*dummy_chunk);
   encoder_->Flush();
-  scoped_ptr<AudioChunk> encoded_dummy_data(encoder_->GetEncodedDataAndClear());
+  scoped_refptr<AudioChunk> encoded_dummy_data(
+      encoder_->GetEncodedDataAndClear());
   DCHECK(!encoded_dummy_data->IsEmpty());
   encoder_.reset();
 
   url_fetcher_->AppendChunkToUpload(encoded_dummy_data->AsString(), true);
 }
 
 void GoogleOneShotRemoteEngine::OnURLFetchComplete(
     const content::URLFetcher* source) {
   DCHECK_EQ(url_fetcher_.get(), source);
   SpeechRecognitionResult result;
@@ skipping 18 matching lines @@
 
 bool GoogleOneShotRemoteEngine::IsRecognitionPending() const {
   return url_fetcher_ != NULL;
 }
 
 int GoogleOneShotRemoteEngine::GetDesiredAudioChunkDurationMs() const {
   return kAudioPacketIntervalMs;
 }
 
 }  // namespace speech