Pulled out Callback code into base/callback.h. This is the first step towards redoing the Callback interfaces.

Added and removed includes as needed.

BUG=35223
TEST=trybots

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39419 0039d316-1c4b-4281-b951-d872f2087c98

28 files changed, 55 insertions, 31 deletions

diff --git a/media/base/callback.h b/media/base/callback.h
index 063bd2b..0d47e93 100644
--- a/media/base/callback.h
+++ b/media/base/callback.h
@@ -1,6 +1,6 @@
-// Copyright (c) 2009 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.
+// Copyright (c) 2010 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.
 
 // Some basic utilities for aiding in the management of Tasks and Callbacks.
 //
@@ -21,6 +21,7 @@
 
 #include <vector>
 
+#include "base/callback.h"
 #include "base/scoped_ptr.h"
 #include "base/task.h"
 
diff --git a/media/base/filters.h b/media/base/filters.h
index 0ac83bb..e5eb4cc 100644
--- a/media/base/filters.h
+++ b/media/base/filters.h
@@ -26,6 +26,7 @@
 #include <limits>
 #include <string>
 
+#include "base/callback.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/ref_counted.h"
diff --git a/media/base/mock_filters.h b/media/base/mock_filters.h
index ca60179..2886f3c 100644
--- a/media/base/mock_filters.h
+++ b/media/base/mock_filters.h
@@ -1,6 +1,6 @@
-// Copyright (c) 2009 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.
+// Copyright (c) 2010 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.
 //
 // A new breed of mock media filters, this time using gmock!  Feel free to add
 // actions if you need interesting side-effects (i.e., copying data to the
@@ -15,6 +15,7 @@
 
 #include <string>
 
+#include "base/callback.h"
 #include "media/base/factory.h"
 #include "media/base/filters.h"
 #include "testing/gmock/include/gmock/gmock.h"
diff --git a/media/base/mock_reader.h b/media/base/mock_reader.h
index 3640981..775bae7 100644
--- a/media/base/mock_reader.h
+++ b/media/base/mock_reader.h
@@ -1,12 +1,13 @@
-// Copyright (c) 2009 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.
+// Copyright (c) 2010 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_BASE_MOCK_READER_H_
 #define MEDIA_BASE_MOCK_READER_H_
 
 #include <string>
 
+#include "base/callback.h"
 #include "base/ref_counted.h"
 #include "base/waitable_event.h"
 #include "media/base/filters.h"
diff --git a/media/base/pipeline.h b/media/base/pipeline.h
index dd571c9..f474df7 100644
--- a/media/base/pipeline.h
+++ b/media/base/pipeline.h
@@ -11,7 +11,7 @@
 
 #include <string>
 
-#include "base/task.h"
+#include "base/callback.h"
 #include "media/base/factory.h"
 
 namespace base {
diff --git a/media/base/pipeline_impl.cc b/media/base/pipeline_impl.cc
index 2b38269..0331e5c 100644
--- a/media/base/pipeline_impl.cc
+++ b/media/base/pipeline_impl.cc
@@ -5,6 +5,7 @@
 // TODO(scherkus): clean up PipelineImpl... too many crazy function names,
 // potential deadlocks, etc...
 
+#include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/condition_variable.h"
 #include "base/stl_util-inl.h"
diff --git a/media/base/pipeline_impl_unittest.cc b/media/base/pipeline_impl_unittest.cc
index 2a2e556..7161abc 100644
--- a/media/base/pipeline_impl_unittest.cc
+++ b/media/base/pipeline_impl_unittest.cc
@@ -4,6 +4,7 @@
 
 #include <string>
 
+#include "base/callback.h"
 #include "base/stl_util-inl.h"
 #include "base/waitable_event.h"
 #include "media/base/pipeline_impl.h"
diff --git a/media/filters/audio_renderer_algorithm_base.h b/media/filters/audio_renderer_algorithm_base.h
index 6ad1c6d..b84e63c 100644
--- a/media/filters/audio_renderer_algorithm_base.h
+++ b/media/filters/audio_renderer_algorithm_base.h
@@ -25,9 +25,9 @@
 
 #include <deque>
 
+#include "base/callback.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
-#include "base/task.h"
 #include "media/base/buffer_queue.h"
 
 namespace media {
diff --git a/media/filters/audio_renderer_algorithm_ola_unittest.cc b/media/filters/audio_renderer_algorithm_ola_unittest.cc
index f4d3504..3de796e 100644
--- a/media/filters/audio_renderer_algorithm_ola_unittest.cc
+++ b/media/filters/audio_renderer_algorithm_ola_unittest.cc
@@ -8,6 +8,7 @@
 // correct rate.  We always pass in a very large destination buffer with the
 // expectation that FillBuffer() will fill as much as it can but no more.
 
+#include "base/callback.h"
 #include "media/base/data_buffer.h"
 #include "media/filters/audio_renderer_algorithm_ola.h"
 #include "testing/gmock/include/gmock/gmock.h"
diff --git a/media/filters/audio_renderer_base.cc b/media/filters/audio_renderer_base.cc
index c141803..712fc45 100644
--- a/media/filters/audio_renderer_base.cc
+++ b/media/filters/audio_renderer_base.cc
@@ -6,6 +6,7 @@
 
 #include <algorithm>
 
+#include "base/callback.h"
 #include "media/base/filter_host.h"
 #include "media/filters/audio_renderer_algorithm_ola.h"
 
diff --git a/media/filters/audio_renderer_base_unittest.cc b/media/filters/audio_renderer_base_unittest.cc
index 5aae2de..62889d0 100644
--- a/media/filters/audio_renderer_base_unittest.cc
+++ b/media/filters/audio_renderer_base_unittest.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/callback.h"
 #include "base/stl_util-inl.h"
 #include "media/base/data_buffer.h"
 #include "media/base/mock_filter_host.h"
diff --git a/media/filters/decoder_base.h b/media/filters/decoder_base.h
index 89bab8b..5729531 100644
--- a/media/filters/decoder_base.h
+++ b/media/filters/decoder_base.h
@@ -1,6 +1,6 @@
-// Copyright (c) 2009 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.
+// Copyright (c) 2010 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.
 
 // A base class that provides the plumbing for a decoder filters.
 
@@ -9,6 +9,7 @@
 
 #include <deque>
 
+#include "base/callback.h"
 #include "base/lock.h"
 #include "base/stl_util-inl.h"
 #include "base/task.h"
diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
index e53efc2..6ae1cb9 100644
--- a/media/filters/ffmpeg_demuxer.cc
+++ b/media/filters/ffmpeg_demuxer.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/callback.h"
 #include "base/command_line.h"
 #include "base/scoped_ptr.h"
 #include "base/stl_util-inl.h"
diff --git a/media/filters/ffmpeg_demuxer.h b/media/filters/ffmpeg_demuxer.h
index b10c3ed..899af84 100644
--- a/media/filters/ffmpeg_demuxer.h
+++ b/media/filters/ffmpeg_demuxer.h
@@ -25,6 +25,7 @@
 #include <deque>
 #include <vector>
 
+#include "base/callback.h"
 #include "base/waitable_event.h"
 #include "media/base/buffers.h"
 #include "media/base/factory.h"
diff --git a/media/filters/ffmpeg_demuxer_unittest.cc b/media/filters/ffmpeg_demuxer_unittest.cc
index e8f6461..2e8eab9 100644
--- a/media/filters/ffmpeg_demuxer_unittest.cc
+++ b/media/filters/ffmpeg_demuxer_unittest.cc
@@ -4,6 +4,7 @@
 
 #include <deque>
 
+#include "base/callback.h"
 #include "base/thread.h"
 #include "media/base/filters.h"
 #include "media/base/mock_ffmpeg.h"
diff --git a/media/filters/file_data_source_unittest.cc b/media/filters/file_data_source_unittest.cc
index a5063c8..8089edf 100644
--- a/media/filters/file_data_source_unittest.cc
+++ b/media/filters/file_data_source_unittest.cc
@@ -5,6 +5,7 @@
 #include <string>
 
 #include "base/base_paths.h"
+#include "base/callback.h"
 #include "base/file_path.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
diff --git a/media/filters/omx_video_decode_engine.cc b/media/filters/omx_video_decode_engine.cc
index 034104c..bca487f 100644
--- a/media/filters/omx_video_decode_engine.cc
+++ b/media/filters/omx_video_decode_engine.cc
@@ -19,6 +19,7 @@
 
 #include "media/filters/omx_video_decode_engine.h"
 
+#include "base/callback.h"
 #include "base/message_loop.h"
 #include "media/base/callback.h"
 #include "media/ffmpeg/ffmpeg_common.h"
diff --git a/media/filters/omx_video_decode_engine.h b/media/filters/omx_video_decode_engine.h
index 4325853..43bb65d 100644
--- a/media/filters/omx_video_decode_engine.h
+++ b/media/filters/omx_video_decode_engine.h
@@ -9,6 +9,7 @@
 #include <list>
 #include <vector>
 
+#include "base/callback.h"
 #include "base/lock.h"
 #include "base/task.h"
 #include "media/filters/video_decode_engine.h"
diff --git a/media/filters/omx_video_decoder.cc b/media/filters/omx_video_decoder.cc
index d239b6f..d5a5e85 100644
--- a/media/filters/omx_video_decoder.cc
+++ b/media/filters/omx_video_decoder.cc
@@ -4,6 +4,7 @@
 
 #include "media/filters/omx_video_decoder.h"
 
+#include "base/callback.h"
 #include "base/waitable_event.h"
 #include "media/ffmpeg/ffmpeg_common.h"
 #include "media/filters/omx_video_decode_engine.h"
diff --git a/media/filters/video_decoder_impl_unittest.cc b/media/filters/video_decoder_impl_unittest.cc
index 95a4507..a1b1cf0 100644
--- a/media/filters/video_decoder_impl_unittest.cc
+++ b/media/filters/video_decoder_impl_unittest.cc
@@ -4,6 +4,7 @@
 
 #include <deque>
 
+#include "base/callback.h"
 #include "base/singleton.h"
 #include "base/string_util.h"
 #include "media/base/data_buffer.h"
diff --git a/media/filters/video_renderer_base.cc b/media/filters/video_renderer_base.cc
index 77a736d..e8c4966 100644
--- a/media/filters/video_renderer_base.cc
+++ b/media/filters/video_renderer_base.cc
@@ -1,7 +1,8 @@
-// Copyright (c) 2009 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.
+// Copyright (c) 2010 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.
 
+#include "base/callback.h"
 #include "media/base/buffers.h"
 #include "media/base/filter_host.h"
 #include "media/base/video_frame_impl.h"
diff --git a/media/filters/video_renderer_base_unittest.cc b/media/filters/video_renderer_base_unittest.cc
index 9735b5f..17b8b13 100644
--- a/media/filters/video_renderer_base_unittest.cc
+++ b/media/filters/video_renderer_base_unittest.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/callback.h"
 #include "base/stl_util-inl.h"
 #include "media/base/data_buffer.h"
 #include "media/base/mock_filter_host.h"
diff --git a/media/omx/omx_codec.cc b/media/omx/omx_codec.cc
index 7699513..a86b263 100644
--- a/media/omx/omx_codec.cc
+++ b/media/omx/omx_codec.cc
@@ -1,10 +1,11 @@
-// Copyright (c) 2010 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.
+// Copyright (c) 2010 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.
 
 #include <algorithm>
 #include <string>
 
+#include "base/callback.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/stl_util-inl.h"
diff --git a/media/omx/omx_codec.h b/media/omx/omx_codec.h
index ebc1e74..d1c3e4b 100644
--- a/media/omx/omx_codec.h
+++ b/media/omx/omx_codec.h
@@ -1,6 +1,6 @@
-// Copyright (c) 2010 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.
+// Copyright (c) 2010 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.
 
 // TODO(ajwong): Generalize this class (fix comments, API, and extract
 // implemntation) so that it can be used for encoding & decoding of both
@@ -139,8 +139,8 @@
 #include <queue>
 #include <vector>
 
+#include "base/callback.h"
 #include "base/scoped_ptr.h"
-#include "base/task.h"
 #include "media/omx/omx_configurator.h"
 #include "media/omx/omx_output_sink.h"
 #include "third_party/openmax/il/OMX_Component.h"
diff --git a/media/omx/omx_codec_unittest.cc b/media/omx/omx_codec_unittest.cc
index 1d3df2c..525bc69 100644
--- a/media/omx/omx_codec_unittest.cc
+++ b/media/omx/omx_codec_unittest.cc
@@ -6,6 +6,7 @@
 
 #include <deque>
 
+#include "base/callback.h"
 #include "base/message_loop.h"
 #include "media/base/mock_filters.h"
 #include "media/omx/mock_omx.h"
diff --git a/media/omx/omx_output_sink.h b/media/omx/omx_output_sink.h
index 504e4b0..b4d0768 100644
--- a/media/omx/omx_output_sink.h
+++ b/media/omx/omx_output_sink.h
@@ -1,6 +1,6 @@
-// Copyright (c) 2010 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.
+// Copyright (c) 2010 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.
 //
 // An abstract class to define the behavior of an output buffer sink for
 // media::OmxCodec. It is responsible for negotiation of buffer allocation
@@ -82,7 +82,7 @@
 
 #include <vector>
 
-#include "base/task.h"
+#include "base/callback.h"
 #include "third_party/openmax/il/OMX_Core.h"
 
 // TODO(hclam): This is just to get the build going. Remove this when we
diff --git a/media/tools/omx_test/omx_test.cc b/media/tools/omx_test/omx_test.cc
index 3085181..428bacc 100644
--- a/media/tools/omx_test/omx_test.cc
+++ b/media/tools/omx_test/omx_test.cc
@@ -1,6 +1,6 @@
-// Copyright (c) 2010 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.
+// Copyright (c) 2010 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.
 
 // A test program that drives an OpenMAX video decoder module. This program
 // will take video in elementary stream and read into the decoder.
@@ -9,6 +9,7 @@
 // ./omx_test
 
 #include "base/at_exit.h"
+#include "base/callback.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/scoped_ptr.h"
diff --git a/media/tools/wav_ola_test/wav_ola_test.cc b/media/tools/wav_ola_test/wav_ola_test.cc
index c07c2d7..3c9e47f 100644
--- a/media/tools/wav_ola_test/wav_ola_test.cc
+++ b/media/tools/wav_ola_test/wav_ola_test.cc
@@ -12,6 +12,7 @@
 #include <iostream>
 #include <string>
 
+#include "base/callback.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/ref_counted.h"