4 files changed, 13 insertions, 11 deletions
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