Try to remove <algorithm> header from scoped_ptr.h, again.

media/formats/mp2t/ts_section_psi.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/mp2t/ts_section_psi.h"
 
+#include <algorithm>
+
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "media/base/bit_reader.h"
 #include "media/formats/mp2t/mp2t_common.h"
 
 static bool IsCrcValid(const uint8* buf, int size) {
   uint32 crc = 0xffffffffu;
   const uint32 kCrcPoly = 0x4c11db7;
 
   for (int k = 0; k < size; k++) {
@@ skipping 106 matching lines @@
 
 void TsSectionPsi::ResetPsiState() {
   wait_for_pusi_ = true;
   psi_byte_queue_.Reset();
   leading_bytes_to_discard_ = 0;
 }
 
 }  // namespace mp2t
 }  // namespace media