VideoDecodeAccelerator now SupportsWeakPtr instead of being RefCountedThreadSafe.

content/content_tests.gypi

 # 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.
 
 {
   'targets': [
     {
       'target_name': 'test_support_content',
       'type': 'static_library',
       'defines!': ['CONTENT_IMPLEMENTATION'],
@@ skipping 610 matching lines @@
                 'sources!': [
                   'common/gpu/media/rendering_helper_gl.cc',
                 ],
               }],
               ['OS=="win"', {
                 'dependencies': [
                   '../third_party/angle/src/build_angle.gyp:libEGL',
                   '../third_party/angle/src/build_angle.gyp:libGLESv2',
                 ],
               }],
-              ['OS=="win" and win_use_allocator_shim==1', {
+              ['(OS=="win" and win_use_allocator_shim==1) or '
+               'os_posix == 1 and OS != "mac" and OS != "android" and '

[brettw, 2012/07/16 22:11:54]

Can you add another set of parens here to make the order more obvious between
the or on the previous line and all of the ands on this line?

[Ami GONE FROM CHROMIUM, 2012/07/16 22:34:04]

Done.

+               'linux_use_tcmalloc==1', {
                 'dependencies': [
                   '../base/allocator/allocator.gyp:allocator',
                 ],
               }],
               ['target_arch != "arm"', {
                  'dependencies': [
                    '../ui/gl/gl.gyp:gl',
                  ],
               }],
               ['target_arch != "arm" and (OS=="linux" or chromeos == 1)', {
@@ skipping 41 matching lines @@
               '<(PRODUCT_DIR)/lib.java/chromium_base.jar',
               '<(PRODUCT_DIR)/lib.java/chromium_content.jar',
             ],
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
       ],
     }],
   ],
 }