osmesa, cdmadapter: drop workaround for VS2013 allocator shim

media/cdm/ppapi/cdm_file_io_impl.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_CDM_FILE_IO_IMPL_H_
 #define MEDIA_CDM_PPAPI_CDM_FILE_IO_IMPL_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
-#include "base/macros.h"
+#include "base/macros.h"  // nogncheck
 #include "media/cdm/api/content_decryption_module.h"
 #include "ppapi/c/ppb_file_io.h"
 #include "ppapi/cpp/file_io.h"
 #include "ppapi/cpp/file_ref.h"
 #include "ppapi/cpp/instance.h"
 #include "ppapi/cpp/module.h"
 #include "ppapi/cpp/private/isolated_file_system_private.h"
 #include "ppapi/utility/completion_callback_factory.h"
 
 namespace media {
@@ skipping 180 matching lines @@
   pp::CompletionCallback first_file_read_cb_;
 
   pp::CompletionCallbackFactory<CdmFileIOImpl> callback_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CdmFileIOImpl);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_CDM_PPAPI_CDM_FILE_IO_IMPL_H_