Revert of media config: expand is_encrypted to a struct.

media/formats/mpeg/mpeg_audio_stream_parser_base.cc

 // Copyright 2014 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/formats/mpeg/mpeg_audio_stream_parser_base.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/message_loop/message_loop.h"
 #include "media/base/media_tracks.h"
-#include "media/base/media_util.h"
 #include "media/base/stream_parser_buffer.h"
 #include "media/base/text_track_config.h"
 #include "media/base/timestamp_constants.h"
 #include "media/base/video_decoder_config.h"
 
 namespace media {
 
 static const uint32_t kICYStartCode = 0x49435920;  // 'ICY '
 
 // Arbitrary upper bound on the size of an IceCast header before it
@@ skipping 177 matching lines @@
        config_.channel_layout() != channel_layout)) {
     // Clear config data so that a config change is initiated.
     config_ = AudioDecoderConfig();
 
     // Send all buffers associated with the previous config.
     if (!buffers->empty() && !SendBuffers(buffers, true))
       return -1;
   }
 
   if (!config_.IsValidConfig()) {
-    config_.Initialize(audio_codec_, kSampleFormatF32, channel_layout,
-                       sample_rate, std::vector<uint8_t>(), Unencrypted(),
-                       base::TimeDelta(), codec_delay_);
+    config_.Initialize(audio_codec_,
+                       kSampleFormatF32,
+                       channel_layout,
+                       sample_rate,
+                       std::vector<uint8_t>(),
+                       false,
+                       base::TimeDelta(),
+                       codec_delay_);
 
     base::TimeDelta base_timestamp;
     if (timestamp_helper_)
       base_timestamp = timestamp_helper_->GetTimestamp();
 
     timestamp_helper_.reset(new AudioTimestampHelper(sample_rate));
     timestamp_helper_->SetBaseTimestamp(base_timestamp);
 
     scoped_ptr<MediaTracks> media_tracks(new MediaTracks());
     if (config_.IsValidConfig()) {
@@ skipping 190 matching lines @@
   if (end_of_segment) {
     in_media_segment_ = false;
     end_of_segment_cb_.Run();
   }
 
   timestamp_helper_->SetBaseTimestamp(base::TimeDelta());
   return true;
 }
 
 }  // namespace media