Test X11 header pollution

media/gpu/h264_dpb.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 <string.h>
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
-#include "content/common/gpu/media/h264_dpb.h"
+#include "media/gpu/h264_dpb.h"
 
-namespace content {
+namespace media {
 
 H264Picture::H264Picture()
     : pic_order_cnt_type(0),
       top_field_order_cnt(0),
       bottom_field_order_cnt(0),
       pic_order_cnt(0),
       pic_order_cnt_msb(0),
       pic_order_cnt_lsb(0),
       delta_pic_order_cnt_bottom(0),
       delta_pic_order_cnt0(0),
@@ skipping 13 matching lines @@
       outputted(false),
       mem_mgmt_5(false),
       nonexisting(false),
       field(FIELD_NONE),
       long_term_reference_flag(false),
       adaptive_ref_pic_marking_mode_flag(false),
       dpb_position(0) {
   memset(&ref_pic_marking, 0, sizeof(ref_pic_marking));
 }
 
-H264Picture::~H264Picture() {
-}
+H264Picture::~H264Picture() {}
 
 V4L2H264Picture* H264Picture::AsV4L2H264Picture() {
   return nullptr;
 }
 
 VaapiH264Picture* H264Picture::AsVaapiH264Picture() {
   return nullptr;
 }
 
 H264DPB::H264DPB() : max_num_pics_(0) {}
@@ skipping 12 matching lines @@
 
 void H264DPB::UpdatePicPositions() {
   size_t i = 0;
   for (auto& pic : pics_) {
     pic->dpb_position = i;
     ++i;
   }
 }
 
 void H264DPB::DeleteByPOC(int poc) {
-  for (H264Picture::Vector::iterator it = pics_.begin();
-       it != pics_.end(); ++it) {
+  for (H264Picture::Vector::iterator it = pics_.begin(); it != pics_.end();
+       ++it) {
     if ((*it)->pic_order_cnt == poc) {
       pics_.erase(it);
       UpdatePicPositions();
       return;
     }
   }
   NOTREACHED() << "Missing POC: " << poc;
 }
 
 void H264DPB::DeleteUnused() {
-  for (H264Picture::Vector::iterator it = pics_.begin(); it != pics_.end(); ) {
+  for (H264Picture::Vector::iterator it = pics_.begin(); it != pics_.end();) {
     if ((*it)->outputted && !(*it)->ref)
       it = pics_.erase(it);
     else
       ++it;
   }
   UpdatePicPositions();
 }
 
 void H264DPB::StorePic(const scoped_refptr<H264Picture>& pic) {
   DCHECK_LT(pics_.size(), max_num_pics_);
@@ skipping 61 matching lines @@
   }
 }
 
 void H264DPB::GetLongTermRefPicsAppending(H264Picture::Vector* out) {
   for (const auto& pic : pics_) {
     if (pic->ref && pic->long_term)
       out->push_back(pic);
   }
 }
 
-}  // namespace content
+}  // namespace media