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

30 files changed, 24 insertions, 43 deletions

diff --git a/ash/magnifier/magnification_controller.h b/ash/magnifier/magnification_controller.h
index fe50168..f0927b6 100644
--- a/ash/magnifier/magnification_controller.h
+++ b/ash/magnifier/magnification_controller.h
@@ -8,7 +8,6 @@
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 
diff --git a/ash/monitor/multi_monitor_manager.h b/ash/monitor/multi_monitor_manager.h
index 3d8a76b..3d81752 100644
--- a/ash/monitor/multi_monitor_manager.h
+++ b/ash/monitor/multi_monitor_manager.h
@@ -6,9 +6,10 @@
 #define ASH_MONITOR_MULTI_MONITOR_MANAGER_H_
 #pragma once
 
+#include <vector>
+
 #include "ash/ash_export.h"
 #include "base/compiler_specific.h"
-#include "base/memory/scoped_ptr.h"
 #include "ui/aura/monitor_manager.h"
 #include "ui/aura/root_window_observer.h"
 #include "ui/aura/window.h"
@@ -78,4 +79,4 @@ extern const aura::WindowProperty<int>* const kMonitorIdKey;
 }  // namespace internal
 }  // namespace ash
 
-#endif  //  ASH_MONITOR_MULTI_MONITOR_MANAGER_H_
+#endif  // ASH_MONITOR_MULTI_MONITOR_MANAGER_H_
diff --git a/ash/system/drive/tray_drive.h b/ash/system/drive/tray_drive.h
index 10ceb0b..cbce4c6 100644
--- a/ash/system/drive/tray_drive.h
+++ b/ash/system/drive/tray_drive.h
@@ -8,8 +8,6 @@
 
 #include "ash/system/drive/drive_observer.h"
 #include "ash/system/tray/tray_image_item.h"
-#include "base/memory/scoped_ptr.h"
-
 
 namespace views {
 class Label;
diff --git a/ash/wm/activation_controller.h b/ash/wm/activation_controller.h
index 7bdb19a..32fe65e 100644
--- a/ash/wm/activation_controller.h
+++ b/ash/wm/activation_controller.h
@@ -9,7 +9,6 @@
 #include "ash/wm/scoped_observer.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "base/memory/scoped_ptr.h"
 #include "ui/aura/client/activation_client.h"
 #include "ui/aura/env_observer.h"
 #include "ui/aura/root_window_observer.h"
diff --git a/base/test/trace_event_analyzer.h b/base/test/trace_event_analyzer.h
index df46839..deda22d 100644
--- a/base/test/trace_event_analyzer.h
+++ b/base/test/trace_event_analyzer.h
@@ -80,8 +80,7 @@
 #include <map>
 
 #include "base/debug/trace_event.h"
-#include "base/memory/ref_counted_memory.h"
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ref_counted.h"
 
 namespace base {
 class Value;
diff --git a/base/win/iunknown_impl.h b/base/win/iunknown_impl.h
index 4f80fa0..2dfdae8 100644
--- a/base/win/iunknown_impl.h
+++ b/base/win/iunknown_impl.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.
 
@@ -11,7 +11,6 @@
 #include "base/atomic_ref_count.h"
 #include "base/base_export.h"
 #include "base/compiler_specific.h"
-#include "base/memory/scoped_ptr.h"
 
 namespace base {
 namespace win {
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"
diff --git a/ui/aura/single_monitor_manager.h b/ui/aura/single_monitor_manager.h
index 9266dd6..b7557ca 100644
--- a/ui/aura/single_monitor_manager.h
+++ b/ui/aura/single_monitor_manager.h
@@ -7,7 +7,6 @@
 #pragma once
 
 #include "base/compiler_specific.h"
-#include "base/memory/scoped_ptr.h"
 #include "ui/aura/aura_export.h"
 #include "ui/aura/monitor_manager.h"
 #include "ui/aura/window_observer.h"
@@ -58,4 +57,4 @@ class AURA_EXPORT SingleMonitorManager : public MonitorManager,
 
 }  // namespace aura
 
-#endif  //  UI_AURA_SINGLE_MONITOR_MANAGER_H_
+#endif  // UI_AURA_SINGLE_MONITOR_MANAGER_H_
diff --git a/ui/aura/test/test_screen.h b/ui/aura/test/test_screen.h
index 46c24c6..1aedda7 100644
--- a/ui/aura/test/test_screen.h
+++ b/ui/aura/test/test_screen.h
@@ -7,7 +7,6 @@
 #pragma once
 
 #include "base/compiler_specific.h"
-#include "base/memory/scoped_ptr.h"
 #include "ui/gfx/screen_impl.h"
 
 namespace aura {
diff --git a/ui/base/models/menu_model.h b/ui/base/models/menu_model.h
index b7f5e4c..7ca33bd 100644
--- a/ui/base/models/menu_model.h
+++ b/ui/base/models/menu_model.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,6 @@
 #define UI_BASE_MODELS_MENU_MODEL_H_
 #pragma once
 
-#include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "ui/base/models/menu_model_delegate.h"
 #include "ui/base/ui_export.h"
diff --git a/ui/compositor/layer_animator.h b/ui/compositor/layer_animator.h
index 4c8a15e..4f41bb5 100644
--- a/ui/compositor/layer_animator.h
+++ b/ui/compositor/layer_animator.h
@@ -11,7 +11,6 @@
 
 #include "base/compiler_specific.h"
 #include "base/memory/linked_ptr.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/time.h"
 #include "ui/base/animation/animation_container_element.h"
diff --git a/ui/oak/oak_tree_model.h b/ui/oak/oak_tree_model.h
index ee62b85..19873961 100644
--- a/ui/oak/oak_tree_model.h
+++ b/ui/oak/oak_tree_model.h
@@ -7,7 +7,6 @@
 #pragma once
 
 #include "base/compiler_specific.h"
-#include "base/memory/scoped_ptr.h"
 #include "ui/base/models/tree_node_model.h"
 
 namespace aura {
diff --git a/ui/views/accessibility/native_view_accessibility_win.h b/ui/views/accessibility/native_view_accessibility_win.h
index 3e39109..128ec30 100644
--- a/ui/views/accessibility/native_view_accessibility_win.h
+++ b/ui/views/accessibility/native_view_accessibility_win.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef VIEWS_ACCESSIBILITY_NATIVE_VIEW_ACCESSIBILITY_WIN_H_
-#define VIEWS_ACCESSIBILITY_NATIVE_VIEW_ACCESSIBILITY_WIN_H_
+#ifndef UI_VIEWS_ACCESSIBILITY_NATIVE_VIEW_ACCESSIBILITY_WIN_H_
+#define UI_VIEWS_ACCESSIBILITY_NATIVE_VIEW_ACCESSIBILITY_WIN_H_
 #pragma once
 
 #include <atlbase.h>
@@ -12,7 +12,7 @@
 #include <oleacc.h>
 #include <UIAutomationCore.h>
 
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ref_counted.h"
 #include "third_party/iaccessible2/ia2_api_all.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/views/controls/native/native_view_host.h"
@@ -397,4 +397,4 @@ NativeViewAccessibilityWin
   DISALLOW_COPY_AND_ASSIGN(NativeViewAccessibilityWin);
 };
 
-#endif  // VIEWS_ACCESSIBILITY_NATIVE_VIEW_ACCESSIBILITY_WIN_H_
+#endif  // UI_VIEWS_ACCESSIBILITY_NATIVE_VIEW_ACCESSIBILITY_WIN_H_
diff --git a/ui/views/controls/menu/menu_runner.h b/ui/views/controls/menu/menu_runner.h
index 1fd4370..384a921 100644
--- a/ui/views/controls/menu/menu_runner.h
+++ b/ui/views/controls/menu/menu_runner.h
@@ -8,7 +8,6 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "base/memory/scoped_ptr.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 
 namespace views {
diff --git a/ui/views/controls/textfield/native_textfield_win.h b/ui/views/controls/textfield/native_textfield_win.h
index 2a7f945..229bd8a 100644
--- a/ui/views/controls/textfield/native_textfield_win.h
+++ b/ui/views/controls/textfield/native_textfield_win.h
@@ -15,6 +15,7 @@
 #include <tom.h>  // For ITextDocument, a COM interface to CRichEditCtrl
 #include <vsstyle.h>
 
+#include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "base/win/scoped_comptr.h"
 #include "ui/base/models/simple_menu_model.h"
diff --git a/ui/views/widget/widget_delegate.h b/ui/views/widget/widget_delegate.h
index 4d516d8..0f9440a 100644
--- a/ui/views/widget/widget_delegate.h
+++ b/ui/views/widget/widget_delegate.h
@@ -8,7 +8,6 @@
 
 #include <string>
 
-#include "base/memory/scoped_ptr.h"
 #include "ui/base/accessibility/accessibility_types.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/views/view.h"