Switch to standard integer types in media/, take 2.

media/cdm/cenc_utils.cc

 // Copyright 2015 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/cdm/cenc_utils.h"
 
+#include "base/macros.h"
 #include "media/formats/mp4/box_definitions.h"
 #include "media/formats/mp4/box_reader.h"
 
 namespace media {
 
 // The initialization data for encrypted media files using the ISO Common
 // Encryption ('cenc') protection scheme may contain one or more protection
 // system specific header ('pssh') boxes.
 // ref: https://w3c.github.io/encrypted-media/cenc-format.html
 
@@ skipping 98 matching lines @@
       pssh_data->assign(child.data.begin(), child.data.end());
       return true;
     }
   }
 
   // No matching 'pssh' box found.
   return false;
 }
 
 }  // namespace media