From adabb62712f972e63fb19afc727093b2008d82ad Mon Sep 17 00:00:00 2001
From: "fischman@chromium.org"
 <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 29 Sep 2011 22:36:38 +0000
Subject: Convert all of media/ over to the new base::{Bind,Callback} hotness.
 Mostly this was a rote conversion, replacing: - Pass-by-pointer CallbackN<>'s
 become pass-by-const-ref Callback<>'s. - scoped_ptr<CallbackN<>> members
 become Callback<> members. - several dedicated FooCallback typedefs became
 base::Closure.

Because it was only used in a small handful of places and only in one place
profitably, I deleted AutoCallbackRunner.

Because it tickles a Bind bug I disabled mfdecoder in .gyp (about to get deleted in a scherkus CL).

BUG=none
TEST=media_tests, trybots

Review URL: http://codereview.chromium.org/8071007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103376 0039d316-1c4b-4281-b951-d872f2087c98
---
 media/media.gyp | 49 +++++++++++++++++++++++++------------------------
 1 file changed, 25 insertions(+), 24 deletions(-)

(limited to 'media/media.gyp')

diff --git a/media/media.gyp b/media/media.gyp
index 4844727..7e3d01b 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -89,8 +89,6 @@
         'base/bitstream_buffer.h',
         'base/buffers.cc',
         'base/buffers.h',
-        'base/callback.cc',
-        'base/callback.h',
         'base/channel_layout.cc',
         'base/channel_layout.h',
         'base/clock.cc',
@@ -732,28 +730,31 @@
             },
           },
         },
-        {
-          'target_name': 'mfdecoder',
-          'type': 'executable',
-          'dependencies': [
-            'media',
-            'yuv_convert',
-            '../base/base.gyp:base',
-          ],
-          'include_dirs': [
-            '..',
-          ],
-          'sources': [
-            'tools/mfdecoder/main.cc',
-            'tools/mfdecoder/mfdecoder.h',
-            'tools/mfdecoder/mfdecoder.cc',
-          ],
-          'msvs_settings': {
-            'VCLinkerTool': {
-              'SubSystem': '1',         # Set /SUBSYSTEM:CONSOLE
-            },
-          },
-        },
+        # TODO(fischman): this target doesn't build w/ the new base::Bind
+        # world (media/tools/mfdecoder/main.cc:412).  Figure out how to fix it
+        # (see bug 94995) or delete the target & source files if no longer used.
+        # {
+        #   'target_name': 'mfdecoder',
+        #   'type': 'executable',
+        #   'dependencies': [
+        #     'media',
+        #     'yuv_convert',
+        #     '../base/base.gyp:base',
+        #   ],
+        #   'include_dirs': [
+        #     '..',
+        #   ],
+        #   'sources': [
+        #     'tools/mfdecoder/main.cc',
+        #     'tools/mfdecoder/mfdecoder.h',
+        #     'tools/mfdecoder/mfdecoder.cc',
+        #   ],
+        #   'msvs_settings': {
+        #     'VCLinkerTool': {
+        #       'SubSystem': '1',         # Set /SUBSYSTEM:CONSOLE
+        #     },
+        #   },
+        # },
       ],
     }],
     ['OS!="mac"', {
-- 
cgit v1.1