Cleanup: Remove unneeded scoped_ptr.h includes from ash, base, media, and ui.

BUG=none
TEST=none
TBR=ben,brettw,hclam

Review URL: https://chromiumcodereview.appspot.com/10391121

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

15 files changed, 12 insertions, 20 deletions

diff --git a/media/audio/audio_output_controller.h b/media/audio/audio_output_controller.h
index 9e9945c..2077c9b 100644
--- a/media/audio/audio_output_controller.h
+++ b/media/audio/audio_output_controller.h
@@ -7,7 +7,6 @@
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/synchronization/lock.h"
 #include "base/time.h"
diff --git a/media/audio/mac/audio_low_latency_output_mac.h b/media/audio/mac/audio_low_latency_output_mac.h
index 45d9773..fbf3b42 100644
--- a/media/audio/mac/audio_low_latency_output_mac.h
+++ b/media/audio/mac/audio_low_latency_output_mac.h
@@ -19,7 +19,7 @@
 
 #include <AudioUnit/AudioUnit.h>
 
-#include "base/memory/scoped_ptr.h"
+#include "base/compiler_specific.h"
 #include "media/audio/audio_io.h"
 #include "media/audio/audio_parameters.h"
 
diff --git a/media/base/android/media_player_bridge.h b/media/base/android/media_player_bridge.h
index 98cafb9..66c3fa6 100644
--- a/media/base/android/media_player_bridge.h
+++ b/media/base/android/media_player_bridge.h
@@ -11,7 +11,6 @@
 
 #include "base/android/scoped_java_ref.h"
 #include "base/callback.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 
 namespace media {
diff --git a/media/base/audio_renderer_sink.h b/media/base/audio_renderer_sink.h
index 49ddbf5..140890c 100644
--- a/media/base/audio_renderer_sink.h
+++ b/media/base/audio_renderer_sink.h
@@ -8,7 +8,6 @@
 #include <vector>
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
 #include "media/audio/audio_parameters.h"
 #include "media/base/media_export.h"
 
@@ -60,7 +59,7 @@ class AudioRendererSink
 
   // Called to inform the sink of a change in playback rate. Override if
   // subclass needs the playback rate.
-  virtual void SetPlaybackRate(float rate) {};
+  virtual void SetPlaybackRate(float rate) {}
 
   // Sets the playback volume, with range [0.0, 1.0] inclusive.
   // Returns |true| on success.
diff --git a/media/base/clock.h b/media/base/clock.h
index a5dff4d..c020de8 100644
--- a/media/base/clock.h
+++ b/media/base/clock.h
@@ -6,7 +6,6 @@
 #define MEDIA_BASE_CLOCK_H_
 
 #include "base/basictypes.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #include "media/base/media_export.h"
 
@@ -30,7 +29,7 @@ class MEDIA_EXPORT Clock {
   // Type for a static function pointer that acts as a time source.
   typedef base::Time(TimeProvider)();
 
-  Clock(TimeProvider* time_provider);
+  explicit Clock(TimeProvider* time_provider);
   ~Clock();
 
   // Returns true if the clock is running.
diff --git a/media/base/filters.h b/media/base/filters.h
index c96d82f..eb58ab4 100644
--- a/media/base/filters.h
+++ b/media/base/filters.h
@@ -28,7 +28,6 @@
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #include "media/base/media_export.h"
 #include "media/base/pipeline_status.h"
diff --git a/media/base/mock_data_source_host.h b/media/base/mock_data_source_host.h
index b569b77..9af893d 100644
--- a/media/base/mock_data_source_host.h
+++ b/media/base/mock_data_source_host.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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 <string>
 
-#include "base/memory/scoped_ptr.h"
 #include "media/base/data_source.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
diff --git a/media/base/mock_demuxer_host.h b/media/base/mock_demuxer_host.h
index 5d854eb..4c46fa9 100644
--- a/media/base/mock_demuxer_host.h
+++ b/media/base/mock_demuxer_host.h
@@ -7,7 +7,6 @@
 
 #include <string>
 
-#include "base/memory/scoped_ptr.h"
 #include "media/base/demuxer.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
diff --git a/media/base/mock_filter_host.h b/media/base/mock_filter_host.h
index 67f91af..911c4c5 100644
--- a/media/base/mock_filter_host.h
+++ b/media/base/mock_filter_host.h
@@ -11,7 +11,6 @@
 
 #include <string>
 
-#include "base/memory/scoped_ptr.h"
 #include "media/base/filter_host.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
diff --git a/media/filters/ffmpeg_video_decoder.h b/media/filters/ffmpeg_video_decoder.h
index a50bbce..15a0893 100644
--- a/media/filters/ffmpeg_video_decoder.h
+++ b/media/filters/ffmpeg_video_decoder.h
@@ -8,7 +8,7 @@
 #include <deque>
 
 #include "base/callback.h"
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ref_counted.h"
 #include "media/base/video_decoder.h"
 #include "media/crypto/aes_decryptor.h"
 
diff --git a/media/filters/video_renderer_base.h b/media/filters/video_renderer_base.h
index f83a977..6f2a459 100644
--- a/media/filters/video_renderer_base.h
+++ b/media/filters/video_renderer_base.h
@@ -7,7 +7,7 @@
 
 #include <deque>
 
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ref_counted.h"
 #include "base/synchronization/condition_variable.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/platform_thread.h"
diff --git a/media/tools/shader_bench/cpu_color_painter.h b/media/tools/shader_bench/cpu_color_painter.h
index b5531e1..7aba3cd 100644
--- a/media/tools/shader_bench/cpu_color_painter.h
+++ b/media/tools/shader_bench/cpu_color_painter.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -6,7 +6,7 @@
 #define MEDIA_TOOLS_SHADER_BENCH_CPU_COLOR_PAINTER_H_
 
 #include "base/compiler_specific.h"
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ref_counted.h"
 #include "media/base/video_frame.h"
 #include "media/tools/shader_bench/gpu_painter.h"
 
diff --git a/media/tools/shader_bench/gpu_color_painter.h b/media/tools/shader_bench/gpu_color_painter.h
index 5ca82bc..63c6f52 100644
--- a/media/tools/shader_bench/gpu_color_painter.h
+++ b/media/tools/shader_bench/gpu_color_painter.h
@@ -6,7 +6,7 @@
 #define MEDIA_TOOLS_SHADER_BENCH_GPU_COLOR_PAINTER_H_
 
 #include "base/compiler_specific.h"
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ref_counted.h"
 #include "media/base/video_frame.h"
 #include "media/tools/shader_bench/gpu_painter.h"
 #include "ui/gl/gl_context.h"
diff --git a/media/tools/shader_bench/painter.h b/media/tools/shader_bench/painter.h
index 3af75da..2dd92ab 100644
--- a/media/tools/shader_bench/painter.h
+++ b/media/tools/shader_bench/painter.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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,7 @@
 
 #include <deque>
 
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ref_counted.h"
 #include "media/base/video_frame.h"
 
 // Class that paints video frames to a window.
diff --git a/media/video/capture/win/sink_filter_win.h b/media/video/capture/win/sink_filter_win.h
index c87a6d2..36bb124 100644
--- a/media/video/capture/win/sink_filter_win.h
+++ b/media/video/capture/win/sink_filter_win.h
@@ -10,7 +10,7 @@
 
 #include <windows.h>
 
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ref_counted.h"
 #include "media/video/capture/video_capture_device.h"
 #include "media/video/capture/video_capture_types.h"
 #include "media/video/capture/win/filter_base_win.h"