Move some files from base to base/memory.

raw_scoped_refptr_mismatch_checker.h
ref_counted.cc
ref_counted.h
ref_counted_memory.cc
ref_counted_memory.h
ref_counted_unittest.cc
scoped_callback_factory.h
scoped_comptr_win.h
scoped_handle.h
scoped_native_library.cc
scoped_native_library.h
scoped_native_library_unittest.cc
scoped_nsobject.h
scoped_open_process.h
scoped_ptr.h
scoped_ptr_unittest.cc
scoped_temp_dir.cc
scoped_temp_dir.h
scoped_temp_dir_unittest.cc
scoped_vector.h
singleton.h
singleton_objc.h
singleton_unittest.cc
linked_ptr.h
linked_ptr_unittest.cc
weak_ptr.cc
weak_ptr.h
weak_ptr_unittest.cc

BUG=None
TEST=Compile

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

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

26 files changed, 44 insertions, 44 deletions

diff --git a/views/accessibility/native_view_accessibility_win.h b/views/accessibility/native_view_accessibility_win.h
index a62456f..89708ab 100644
--- a/views/accessibility/native_view_accessibility_win.h
+++ b/views/accessibility/native_view_accessibility_win.h
@@ -11,7 +11,7 @@
 
 #include <oleacc.h>
 
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "views/controls/native/native_view_host.h"
 #include "views/view.h"
diff --git a/views/animation/bounds_animator.cc b/views/animation/bounds_animator.cc
index 7039eb7..6c38422 100644
--- a/views/animation/bounds_animator.cc
+++ b/views/animation/bounds_animator.cc
@@ -1,10 +1,10 @@
-// Copyright (c) 2010 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.
 
 #include "views/animation/bounds_animator.h"
 
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
 #include "ui/base/animation/animation_container.h"
 #include "ui/base/animation/slide_animation.h"
 #include "views/view.h"
diff --git a/views/animation/bounds_animator.h b/views/animation/bounds_animator.h
index e11f484..940f289 100644
--- a/views/animation/bounds_animator.h
+++ b/views/animation/bounds_animator.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 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.
 
@@ -8,7 +8,7 @@
 
 #include <map>
 
-#include "base/ref_counted.h"
+#include "base/memory/ref_counted.h"
 #include "ui/base/animation/animation_container_observer.h"
 #include "ui/base/animation/animation_delegate.h"
 #include "ui/gfx/rect.h"
diff --git a/views/controls/menu/menu_2.h b/views/controls/menu/menu_2.h
index 7204120..01cb51b 100644
--- a/views/controls/menu/menu_2.h
+++ b/views/controls/menu/menu_2.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 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.
 
@@ -6,7 +6,7 @@
 #define VIEWS_CONTROLS_MENU_MENU_2_H_
 #pragma once
 
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
 #include "ui/base/models/menu_model.h"
 #include "views/controls/menu/menu_wrapper.h"
 
diff --git a/views/controls/menu/menu_controller.h b/views/controls/menu/menu_controller.h
index 577bda3..8458a30 100644
--- a/views/controls/menu/menu_controller.h
+++ b/views/controls/menu/menu_controller.h
@@ -12,8 +12,8 @@
 #include <set>
 #include <vector>
 
+#include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
-#include "base/scoped_ptr.h"
 #include "base/timer.h"
 #include "views/controls/menu/menu_delegate.h"
 #include "views/controls/menu/menu_item_view.h"
diff --git a/views/controls/menu/native_menu_win.h b/views/controls/menu/native_menu_win.h
index eb28bbe..72edc52 100644
--- a/views/controls/menu/native_menu_win.h
+++ b/views/controls/menu/native_menu_win.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 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.
 
@@ -8,7 +8,7 @@
 
 #include <vector>
 
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "views/controls/menu/menu_wrapper.h"
 
diff --git a/views/controls/native_control.cc b/views/controls/native_control.cc
index 7dd01f3..ebf668e 100644
--- a/views/controls/native_control.cc
+++ b/views/controls/native_control.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 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.
 
@@ -11,7 +11,7 @@
 #include <atlmisc.h>
 
 #include "base/logging.h"
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
 #include "ui/base/accessibility/accessibility_types.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/keycodes/keyboard_code_conversion_win.h"
diff --git a/views/controls/native_control_win.h b/views/controls/native_control_win.h
index aeed914..8b446b5 100644
--- a/views/controls/native_control_win.h
+++ b/views/controls/native_control_win.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 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.
 
@@ -6,8 +6,8 @@
 #define VIEWS_CONTROLS_NATIVE_CONTROL_WIN_H_
 #pragma once
 
-#include "base/scoped_ptr.h"
-#include "base/scoped_vector.h"
+#include "base/memory/scoped_ptr.h"
+#include "base/memory/scoped_vector.h"
 #include "views/controls/combobox/combobox.h"
 #include "views/controls/native/native_view_host.h"
 #include "views/widget/child_window_message_processor.h"
diff --git a/views/controls/table/table_view2.h b/views/controls/table/table_view2.h
index a3cbb74..f7b3772 100644
--- a/views/controls/table/table_view2.h
+++ b/views/controls/table/table_view2.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 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.
 
@@ -11,7 +11,7 @@
 #include <map>
 #include <vector>
 
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
 #include "ui/gfx/rect.h"
 #include "views/controls/table/table_view.h"
 #include "views/controls/table/native_table_wrapper.h"
diff --git a/views/controls/textfield/textfield_views_model_unittest.cc b/views/controls/textfield/textfield_views_model_unittest.cc
index 6c946da..4339dac 100644
--- a/views/controls/textfield/textfield_views_model_unittest.cc
+++ b/views/controls/textfield/textfield_views_model_unittest.cc
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 #include "base/auto_reset.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
-#include "base/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/clipboard/clipboard.h"
diff --git a/views/focus/focus_manager.h b/views/focus/focus_manager.h
index 25669ad..37713ba 100644
--- a/views/focus/focus_manager.h
+++ b/views/focus/focus_manager.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 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.
 
@@ -11,7 +11,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/singleton.h"
+#include "base/memory/singleton.h"
 #include "ui/gfx/native_widget_types.h"
 #include "views/accelerator.h"
 
diff --git a/views/focus/view_storage.h b/views/focus/view_storage.h
index 892989a..8673e59 100644
--- a/views/focus/view_storage.h
+++ b/views/focus/view_storage.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 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.
 
@@ -6,7 +6,7 @@
 #define VIEWS_FOCUS_VIEW_STORAGE_H_
 #pragma once
 
-#include "base/singleton.h"
+#include "base/memory/singleton.h"
 #include "views/view.h"
 
 // This class is a simple storage place for storing/retrieving views.  It is
diff --git a/views/mouse_watcher.h b/views/mouse_watcher.h
index f062c27..0294a71 100644
--- a/views/mouse_watcher.h
+++ b/views/mouse_watcher.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 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,7 @@
 #pragma once
 
 #include "base/basictypes.h"
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
 #include "ui/gfx/insets.h"
 
 namespace views {
diff --git a/views/repeat_controller.h b/views/repeat_controller.h
index e96a3d1..e50f36f 100644
--- a/views/repeat_controller.h
+++ b/views/repeat_controller.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 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,7 @@
 #pragma once
 
 #include "base/callback.h"
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/timer.h"
 
 namespace views {
diff --git a/views/test/test_views_delegate.h b/views/test/test_views_delegate.h
index 55febf6..afa6d97 100644
--- a/views/test/test_views_delegate.h
+++ b/views/test/test_views_delegate.h
@@ -5,7 +5,7 @@
 #ifndef VIEWS_TEST_TEST_VIEWS_DELEGATE_H_
 #define VIEWS_TEST_TEST_VIEWS_DELEGATE_H_
 
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
 #include "ui/base/accessibility/accessibility_types.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "views/views_delegate.h"
diff --git a/views/touchui/gesture_manager.h b/views/touchui/gesture_manager.h
index 492a4e6..ddd3803 100644
--- a/views/touchui/gesture_manager.h
+++ b/views/touchui/gesture_manager.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 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.
 
@@ -6,7 +6,7 @@
 #define VIEWS_TOUCHUI_GESTURE_MANAGER_H_
 #pragma once
 
-#include "base/singleton.h"
+#include "base/memory/singleton.h"
 #include "views/view.h"
 
 namespace views {
diff --git a/views/touchui/touch_factory.h b/views/touchui/touch_factory.h
index b3e32ef..acd02f3 100644
--- a/views/touchui/touch_factory.h
+++ b/views/touchui/touch_factory.h
@@ -9,7 +9,7 @@
 #include <bitset>
 #include <vector>
 
-#include "base/singleton.h"
+#include "base/memory/singleton.h"
 #include "base/timer.h"
 
 typedef unsigned long Cursor;
diff --git a/views/view.cc b/views/view.cc
index a66587e..6770d6d 100644
--- a/views/view.cc
+++ b/views/view.cc
@@ -7,8 +7,8 @@
 #include <algorithm>
 
 #include "base/logging.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
-#include "base/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
 #include "third_party/skia/include/core/SkRect.h"
 #include "ui/base/accessibility/accessibility_types.h"
diff --git a/views/view.h b/views/view.h
index e09f0bee..4f845dd 100644
--- a/views/view.h
+++ b/views/view.h
@@ -15,7 +15,7 @@
 #include <vector>
 
 #include "base/i18n/rtl.h"
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/rect.h"
diff --git a/views/widget/aero_tooltip_manager.h b/views/widget/aero_tooltip_manager.h
index e7fe5af..abdb54bc 100644
--- a/views/widget/aero_tooltip_manager.h
+++ b/views/widget/aero_tooltip_manager.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 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.
 
@@ -6,7 +6,7 @@
 #define VIEWS_WIDGET_AERO_TOOLTIP_MANAGER_H_
 #pragma once
 
-#include "base/ref_counted.h"
+#include "base/memory/ref_counted.h"
 #include "base/task.h"
 #include "views/widget/tooltip_manager_win.h"
 
diff --git a/views/widget/drop_target_gtk.h b/views/widget/drop_target_gtk.h
index 0a3923f..eea1df7 100644
--- a/views/widget/drop_target_gtk.h
+++ b/views/widget/drop_target_gtk.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.
 
@@ -9,7 +9,7 @@
 #include <gtk/gtk.h>
 #include <set>
 
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "views/widget/drop_helper.h"
 
diff --git a/views/widget/root_view.h b/views/widget/root_view.h
index 68433b0..6be5f4e 100644
--- a/views/widget/root_view.h
+++ b/views/widget/root_view.h
@@ -8,7 +8,7 @@
 
 #include <string>
 
-#include "base/ref_counted.h"
+#include "base/memory/ref_counted.h"
 #include "views/focus/focus_manager.h"
 #include "views/focus/focus_search.h"
 #include "views/view.h"
diff --git a/views/widget/widget.h b/views/widget/widget.h
index cb6a3ce..71f33bf 100644
--- a/views/widget/widget.h
+++ b/views/widget/widget.h
@@ -8,8 +8,8 @@
 
 #include <vector>
 
-#include "base/ref_counted.h"
-#include "base/scoped_ptr.h"
+#include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
 #include "ui/base/accessibility/accessibility_types.h"
 #include "ui/gfx/native_widget_types.h"
 #include "views/focus/focus_manager.h"
diff --git a/views/widget/widget_win.h b/views/widget/widget_win.h
index b5bc23c..48ac644 100644
--- a/views/widget/widget_win.h
+++ b/views/widget/widget_win.h
@@ -14,9 +14,9 @@
 #include <string>
 #include <vector>
 
+#include "base/memory/scoped_ptr.h"
+#include "base/memory/scoped_vector.h"
 #include "base/message_loop.h"
-#include "base/scoped_ptr.h"
-#include "base/scoped_vector.h"
 #include "base/win/scoped_comptr.h"
 #include "ui/base/win/window_impl.h"
 #include "views/focus/focus_manager.h"
diff --git a/views/widget/widget_win_unittest.cc b/views/widget/widget_win_unittest.cc
index d0cb4e4..94b3fd1 100644
--- a/views/widget/widget_win_unittest.cc
+++ b/views/widget/widget_win_unittest.cc
@@ -5,8 +5,8 @@
 #include "views/widget/widget_win.h"
 
 #include "base/basictypes.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
-#include "base/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using namespace views;
diff --git a/views/window/window_delegate.h b/views/window/window_delegate.h
index d1a350a..41ef6d9 100644
--- a/views/window/window_delegate.h
+++ b/views/window/window_delegate.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 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.
 
@@ -8,7 +8,7 @@
 
 #include <string>
 
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
 #include "ui/base/accessibility/accessibility_types.h"
 #include "views/widget/widget_delegate.h"