Eliminate box reordering in media::mp4::BoxReader.

media/mp4/box_reader.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 "media/mp4/box_reader.h"
 
 #include <string.h>
 #include <algorithm>
 #include <map>
 #include <set>
@@ skipping 145 matching lines @@
                    << std::hex << type;
       return false;
   }
 }
 
 bool BoxReader::ScanChildren() {
   DCHECK(!scanned_);
   scanned_ = true;
 
   bool err = false;
-  // TODO(strobe): Check or correct for multimap not inserting elements in
-  // consistent order.
   while (pos() < size()) {
     BoxReader child(&buf_[pos_], size_ - pos_);
     if (!child.ReadHeader(&err)) break;
 
     children_.insert(std::pair<FourCC, BoxReader>(child.type(), child));
     pos_ += child.size();
   }
 
   DCHECK(!err);
   return !err && pos() == size();
@@ skipping 49 matching lines @@
   }
 
   // Note that the pos_ head has advanced to the byte immediately after the
   // header, which is where we want it.
   size_ = size;
   return true;
 }
 
 }  // namespace mp4
 }  // namespace media