Use callback_forward.h instead of callback.h where possible.

callback_forward.h will be committed separately, before this commit, and is included here only to assist in running try jobs. It will be removed before the final commit.

You are asked to review this as you have OWNERS for these files.

BUG=None
TEST=Compiles
R=ben@chromium.org


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

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

6 files changed, 8 insertions, 11 deletions

diff --git a/chrome/common/service_process_util.h b/chrome/common/service_process_util.h
index f9defa5..427bfcd 100644
--- a/chrome/common/service_process_util.h
+++ b/chrome/common/service_process_util.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "base/callback.h"
+#include "base/callback_forward.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/process.h"
 #include "base/shared_memory.h"
@@ -17,7 +17,7 @@
 class CommandLine;
 
 namespace base {
-  class MessageLoopProxy;
+class MessageLoopProxy;
 }
 
 // Return the IPC channel to connect to the service process.
diff --git a/chrome/renderer/safe_browsing/malware_dom_details.h b/chrome/renderer/safe_browsing/malware_dom_details.h
index e8eaa5c..a464cec 100644
--- a/chrome/renderer/safe_browsing/malware_dom_details.h
+++ b/chrome/renderer/safe_browsing/malware_dom_details.h
@@ -13,7 +13,6 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/task.h"
 #include "content/public/renderer/render_view_observer.h"
diff --git a/chrome_frame/sync_msg_reply_dispatcher.h b/chrome_frame/sync_msg_reply_dispatcher.h
index a168788..d5cb64e 100644
--- a/chrome_frame/sync_msg_reply_dispatcher.h
+++ b/chrome_frame/sync_msg_reply_dispatcher.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -7,7 +7,6 @@
 
 #include <deque>
 
-#include "base/callback.h"
 #include "base/synchronization/lock.h"
 #include "ipc/ipc_channel_proxy.h"
 
diff --git a/media/base/mock_reader.h b/media/base/mock_reader.h
index a6122a9..6098362 100644
--- a/media/base/mock_reader.h
+++ b/media/base/mock_reader.h
@@ -8,7 +8,6 @@
 #include <string>
 
 #include "base/bind.h"
-#include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "media/base/filters.h"
 
diff --git a/ui/gfx/surface/accelerated_surface_win.cc b/ui/gfx/surface/accelerated_surface_win.cc
index c3bc154..5f7330f 100644
--- a/ui/gfx/surface/accelerated_surface_win.cc
+++ b/ui/gfx/surface/accelerated_surface_win.cc
@@ -262,7 +262,7 @@ void AcceleratedSurface::Destroy() {
 void AcceleratedSurface::AsyncPresentAndAcknowledge(
     const gfx::Size& size,
     int64 surface_id,
-    base::Closure completion_task) {
+    const base::Closure& completion_task) {
   const int kRound = 64;
   gfx::Size quantized_size(
       std::max(1, (size.width() + kRound - 1) / kRound * kRound),
@@ -429,7 +429,7 @@ void AcceleratedSurface::DoResize(const gfx::Size& size) {
 void AcceleratedSurface::DoPresentAndAcknowledge(
     const gfx::Size& size,
     int64 surface_id,
-    base::Closure completion_task) {
+    const base::Closure& completion_task) {
   TRACE_EVENT1("surface", "DoPresentAndAcknowledge", "surface_id", surface_id);
 
   HRESULT hr;
diff --git a/ui/gfx/surface/accelerated_surface_win.h b/ui/gfx/surface/accelerated_surface_win.h
index d1fe069..5f2dd32 100644
--- a/ui/gfx/surface/accelerated_surface_win.h
+++ b/ui/gfx/surface/accelerated_surface_win.h
@@ -8,7 +8,7 @@
 
 #include <d3d9.h>
 
-#include "base/callback.h"
+#include "base/callback_forward.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop_proxy.h"
 #include "base/synchronization/lock.h"
@@ -31,7 +31,7 @@ class SURFACE_EXPORT AcceleratedSurface
   // this surface will be held while the completion callback runs.
   void AsyncPresentAndAcknowledge(const gfx::Size& size,
                                   int64 surface_id,
-                                  base::Closure completion_task);
+                                  const base::Closure& completion_task);
 
   // Synchronously present a frame with no acknowledgement.
   void Present();
@@ -43,7 +43,7 @@ class SURFACE_EXPORT AcceleratedSurface
   void DoResize(const gfx::Size& size);
   void DoPresentAndAcknowledge(const gfx::Size& size,
                                int64 surface_id,
-                               base::Closure completion_task);
+                               const base::Closure& completion_task);
 
   // Immutable and accessible from any thread without the lock.
   const int thread_affinity_;