osmesa, cdmadapter: drop workaround for VS2013 allocator shim

media/cdm/cdm_helpers.h

 // 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.
 
 #ifndef MEDIA_CDM_CDM_HELPERS_H_
 #define MEDIA_CDM_CDM_HELPERS_H_
 
 #include <stdint.h>
 
-#include "base/compiler_specific.h"
-#include "base/macros.h"
+#include "base/compiler_specific.h"  // nogncheck
+#include "base/macros.h"  // nogncheck
 #include "media/cdm/api/content_decryption_module.h"
 
 #if !defined(USE_PPAPI_CDM_ADAPTER)
-#include "base/memory/ref_counted.h"
+#include "base/memory/ref_counted.h"  // nogncheck
 #include "media/base/media_export.h"
 #include "ui/gfx/geometry/size.h"
 #define MEDIA_CDM_EXPORT MEDIA_EXPORT
 #else
 #define MEDIA_CDM_EXPORT
 #endif
 
 namespace media {
 
 class VideoFrame;
@@ skipping 91 matching lines @@
  private:
   cdm::Buffer* buffer_;
   cdm::AudioFormat format_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioFramesImpl);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_CDM_CDM_HELPERS_H_