ABANDONED CL: Changes needed to make things compile after running rewrite_to_chrome_style tool.

third_party/WebKit/Source/modules/mediasource/SourceBuffer.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 672 matching lines @@
 template <class T>
 T* findExistingTrackById(const TrackListBase<T>& trackList, const String& id) {
   // According to MSE specification
   // (https://w3c.github.io/media-source/#sourcebuffer-init-segment-received)
   // step 3.1:
   // > If more than one track for a single type are present (ie 2 audio tracks),
   // then the Track IDs match the ones in the first initialization segment.
   // I.e. we only need to search by TrackID if there is more than one track,
   // otherwise we can assume that the only track of the given type is the same
   // one that we had in previous init segments.
-  if (trackList.length() == 1)
-    return trackList.anonymousIndexedGetter(0);
-  return trackList.getTrackById(id);
+  if (track_list.GetLength() == 1)
+    return track_list.AnonymousIndexedGetter(0);
+  /* DO NOT SUBMIT - merge conflict marker.
+   * Please spell |getTrackById|, not |GetTrackById| below. */
+  return track_list.getTrackById(id);
 }
 
 const TrackDefault* SourceBuffer::getTrackDefault(
     const AtomicString& trackType,
     const AtomicString& byteStreamTrackID) const {
   // This is a helper for implementation of default track label and default
   // track language algorithms.
   // defaultTrackLabel spec:
   // https://w3c.github.io/media-source/#sourcebuffer-default-track-label
   // defaultTrackLanguage spec:
@@ skipping 593 matching lines @@
   visitor->trace(m_asyncEventQueue);
   visitor->trace(m_appendBufferAsyncPartRunner);
   visitor->trace(m_removeAsyncPartRunner);
   visitor->trace(m_audioTracks);
   visitor->trace(m_videoTracks);
   EventTargetWithInlineData::trace(visitor);
   SuspendableObject::trace(visitor);
 }
 
 }  // namespace blink