Clean up WebSourceBufferClient interface

media/blink/websourcebuffer_impl.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 "media/blink/websourcebuffer_impl.h"
 
 #include <stdint.h>
 
 #include <cmath>
 #include <limits>
@@ skipping 161 matching lines @@
   NOTREACHED();
   return blink::WebMediaPlayer::AudioTrack;
 }
 
 void WebSourceBufferImpl::InitSegmentReceived(scoped_ptr<MediaTracks> tracks) {
   DCHECK(tracks.get());
   DVLOG(1) << __FUNCTION__ << " tracks=" << tracks->tracks().size();
 
   std::vector<blink::WebSourceBufferClient::MediaTrackInfo> trackInfoVector;
   for (const auto& track : tracks->tracks()) {
-    trackInfoVector.push_back(
-        std::make_tuple(mediaTrackTypeToBlink(track->type()),
-                        blink::WebString::fromUTF8(track->id()),
-                        blink::WebString::fromUTF8(track->kind()),
-                        blink::WebString::fromUTF8(track->label()),
-                        blink::WebString::fromUTF8(track->language())));
+    blink::WebSourceBufferClient::MediaTrackInfo trackInfo;
+    trackInfo.trackType = mediaTrackTypeToBlink(track->type());
+    trackInfo.byteStreamTrackId = blink::WebString::fromUTF8(track->id());
+    trackInfo.kind = blink::WebString::fromUTF8(track->kind());
+    trackInfo.label = blink::WebString::fromUTF8(track->label());
+    trackInfo.language = blink::WebString::fromUTF8(track->language());
+    trackInfoVector.push_back(trackInfo);
   }
 
-  std::vector<blink::WebMediaPlayer::TrackId> blinkTrackIds =
-      client_->initializationSegmentReceived(trackInfoVector);
+  client_->initializationSegmentReceived(trackInfoVector);
 }
 
 }  // namespace media