osmesa, cdmadapter: drop workaround for VS2013 allocator shim

media/cdm/ppapi/ppapi_cdm_buffer.h

 // Copyright 2013 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.
 
 #ifndef MEDIA_CDM_PPAPI_PPAPI_CDM_BUFFER_H_
 #define MEDIA_CDM_PPAPI_PPAPI_CDM_BUFFER_H_
 
 #include <map>
 #include <utility>
 
-#include "base/compiler_specific.h"
-#include "base/macros.h"
+#include "base/compiler_specific.h"  // nogncheck
+#include "base/macros.h"  // nogncheck
 #include "build/build_config.h"
 #include "media/cdm/api/content_decryption_module.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/pp_stdint.h"
 #include "ppapi/cpp/dev/buffer_dev.h"
 #include "ppapi/cpp/instance.h"
 #include "ppapi/cpp/logging.h"
 
 namespace media {
 
@@ skipping 65 matching lines @@
   uint32_t next_buffer_id_;
   AllocatedBufferMap allocated_buffers_;
   FreeBufferMap free_buffers_;
 
   DISALLOW_COPY_AND_ASSIGN(PpbBufferAllocator);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_CDM_PPAPI_PPAPI_CDM_BUFFER_H_