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

9 files changed, 7 insertions, 13 deletions

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"