Make AudioDecoderConfig copyable.

media/filters/decrypting_audio_decoder.cc

Index: media/filters/decrypting_audio_decoder.cc
diff --git a/media/filters/decrypting_audio_decoder.cc b/media/filters/decrypting_audio_decoder.cc
index 4ae6718f14d42a78c75cbe383f17d0dbe5db2683..983ad47ff5f99249e52664a68b21d264ef453138 100644
--- a/media/filters/decrypting_audio_decoder.cc
+++ b/media/filters/decrypting_audio_decoder.cc
@@ -174,19 +174,19 @@ void DecryptingAudioDecoder::SetDecryptor(Decryptor* decryptor) {
 
   const AudioDecoderConfig& input_config =
       demuxer_stream_->audio_decoder_config();
-  scoped_ptr<AudioDecoderConfig> scoped_config(new AudioDecoderConfig());
-  scoped_config->Initialize(input_config.codec(),
-                            kSampleFormatS16,
-                            input_config.channel_layout(),
-                            input_config.samples_per_second(),
-                            input_config.extra_data(),
-                            input_config.extra_data_size(),
-                            input_config.is_encrypted(),
-                            false);
+  AudioDecoderConfig config;
+  config.Initialize(input_config.codec(),
+                    kSampleFormatS16,
+                    input_config.channel_layout(),
+                    input_config.samples_per_second(),
+                    input_config.extra_data(),
+                    input_config.extra_data_size(),
+                    input_config.is_encrypted(),
+                    false);
 
   state_ = kPendingDecoderInit;
   decryptor_->InitializeAudioDecoder(
-      scoped_config.Pass(),
+      config,
       BindToCurrentLoop(base::Bind(
           &DecryptingAudioDecoder::FinishInitialization, this)));
 }
@@ -265,20 +265,20 @@ void DecryptingAudioDecoder::DecryptAndDecodeBuffer(
 
   const AudioDecoderConfig& input_config =
       demuxer_stream_->audio_decoder_config();
-  scoped_ptr<AudioDecoderConfig> scoped_config(new AudioDecoderConfig());
-  scoped_config->Initialize(input_config.codec(),
-                            kSampleFormatS16,
-                            input_config.channel_layout(),
-                            input_config.samples_per_second(),
-                            input_config.extra_data(),
-                            input_config.extra_data_size(),
-                            input_config.is_encrypted(),
-                            false);
+  AudioDecoderConfig config;
+  config.Initialize(input_config.codec(),
+                    kSampleFormatS16,
+                    input_config.channel_layout(),
+                    input_config.samples_per_second(),
+                    input_config.extra_data(),
+                    input_config.extra_data_size(),
+                    input_config.is_encrypted(),
+                    false);
 
     state_ = kPendingConfigChange;
     decryptor_->DeinitializeDecoder(Decryptor::kAudio);
     decryptor_->InitializeAudioDecoder(
-        scoped_config.Pass(), BindToCurrentLoop(base::Bind(
+        config, BindToCurrentLoop(base::Bind(
             &DecryptingAudioDecoder::FinishConfigChange, this)));
     return;
   }