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

7 files changed, 16 insertions, 10 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"