summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--base/command_line.h1
-rw-r--r--base/condition_variable.h1
-rw-r--r--base/histogram.cc1
-rw-r--r--base/histogram.h1
-rw-r--r--base/json_reader.cc1
-rw-r--r--base/logging.h1
-rw-r--r--base/message_loop.h1
-rw-r--r--base/message_pump_glib.h1
-rw-r--r--base/process_util_posix.cc1
-rw-r--r--base/stats_table.cc1
-rw-r--r--base/time_format.cc1
-rw-r--r--base/win_util.cc1
-rw-r--r--chrome/browser/autocomplete/autocomplete_popup_model.h1
-rwxr-xr-xchrome/browser/autocomplete/autocomplete_popup_view_gtk.cc1
-rwxr-xr-xchrome/browser/autocomplete/autocomplete_popup_view_win.cc1
-rw-r--r--chrome/browser/browser.h1
-rw-r--r--chrome/browser/download/download_file.cc1
-rw-r--r--chrome/browser/download/save_file_manager.cc1
-rw-r--r--chrome/browser/external_protocol_handler.cc1
-rw-r--r--chrome/browser/gtk/location_bar_view_gtk.h1
-rw-r--r--chrome/browser/history/in_memory_history_backend.h1
-rw-r--r--chrome/browser/renderer_host/render_widget_host.h1
-rw-r--r--chrome/browser/search_engines/template_url_parser_unittest.cc1
-rw-r--r--chrome/browser/tab_contents/interstitial_page.h1
-rw-r--r--chrome/browser/tab_contents/tab_contents.h1
-rw-r--r--chrome/browser/tab_contents/web_contents_view_mac.h1
-rw-r--r--chrome/browser/views/password_manager_exceptions_view.h1
-rw-r--r--chrome/browser/views/status_bubble_views.cc1
-rw-r--r--chrome/browser/worker_host/worker_process_host.h1
-rw-r--r--chrome/common/chrome_plugin_lib.h1
-rw-r--r--chrome/common/libxml_utils.h1
-rw-r--r--chrome/common/resource_dispatcher_unittest.cc1
-rw-r--r--chrome/installer/util/helper_unittest.cc1
-rw-r--r--chrome/installer/util/install_util.cc1
-rw-r--r--chrome/installer/util/l10n_string_util.cc1
-rw-r--r--chrome/views/link.cc1
-rw-r--r--chrome/views/repeat_controller.h1
-rw-r--r--chrome/views/tree_node_model.h1
-rw-r--r--media/base/mock_filter_host.h1
-rw-r--r--media/filters/ffmpeg_demuxer.cc1
-rw-r--r--media/filters/null_audio_renderer.h1
-rw-r--r--net/base/client_socket_pool.h1
-rw-r--r--net/base/net_util.cc1
-rw-r--r--net/base/tcp_client_socket.h1
-rw-r--r--net/disk_cache/entry_impl.h1
-rw-r--r--net/url_request/url_request_context.h1
-rw-r--r--sandbox/src/job_unittest.cc1
-rw-r--r--sandbox/src/named_pipe_policy.cc1
-rw-r--r--sandbox/src/restricted_token_unittest.cc1
-rw-r--r--sandbox/src/win_utils.cc1
-rw-r--r--sandbox/src/win_utils.h1
-rw-r--r--webkit/activex_shim/dispatch_object.h1
-rw-r--r--webkit/glue/autocomplete_input_listener.h1
-rw-r--r--webkit/glue/glue_serialize.cc1
-rw-r--r--webkit/glue/image_decoder.h1
-rw-r--r--webkit/glue/plugins/plugin_lib.h1
-rw-r--r--webkit/glue/webkitclient_impl.h1
-rw-r--r--webkit/glue/webplugin_impl.h1
-rw-r--r--webkit/tools/test_shell/plugin_tests.cc1
-rw-r--r--webkit/tools/test_shell/webview_host.h1
60 files changed, 25 insertions, 35 deletions
diff --git a/base/command_line.h b/base/command_line.h
index c79268d7..c727b8a 100644
--- a/base/command_line.h
+++ b/base/command_line.h
@@ -25,7 +25,6 @@
#include "base/basictypes.h"
#include "base/logging.h"
-#include "base/scoped_ptr.h"
class InProcessBrowserTest;
diff --git a/base/condition_variable.h b/base/condition_variable.h
index c292f3d..5eb2c64 100644
--- a/base/condition_variable.h
+++ b/base/condition_variable.h
@@ -66,7 +66,6 @@
#define BASE_CONDITION_VARIABLE_H_
#include "base/lock.h"
-#include "base/scoped_ptr.h"
#include "base/time.h"
class ConditionVariable {
diff --git a/base/histogram.cc b/base/histogram.cc
index 3234eb9..bdf7f9a 100644
--- a/base/histogram.cc
+++ b/base/histogram.cc
@@ -13,7 +13,6 @@
#include <string>
#include "base/logging.h"
-#include "base/scoped_ptr.h"
#include "base/string_util.h"
using base::TimeDelta;
diff --git a/base/histogram.h b/base/histogram.h
index 5bf0fc1..f66c9b4 100644
--- a/base/histogram.h
+++ b/base/histogram.h
@@ -37,7 +37,6 @@
#include "base/lock.h"
#include "base/pickle.h"
-#include "base/scoped_ptr.h"
#include "base/stats_counters.h"
//------------------------------------------------------------------------------
diff --git a/base/json_reader.cc b/base/json_reader.cc
index b5013ef..fd11a18 100644
--- a/base/json_reader.cc
+++ b/base/json_reader.cc
@@ -6,6 +6,7 @@
#include "base/float_util.h"
#include "base/logging.h"
+#include "base/scoped_ptr.h"
#include "base/string_util.h"
#include "base/values.h"
diff --git a/base/logging.h b/base/logging.h
index ee3ab40..d671ef5 100644
--- a/base/logging.h
+++ b/base/logging.h
@@ -10,7 +10,6 @@
#include <sstream>
#include "base/basictypes.h"
-#include "base/scoped_ptr.h"
//
// Optional message capabilities
diff --git a/base/message_loop.h b/base/message_loop.h
index 6cd0ef4..d5ef281 100644
--- a/base/message_loop.h
+++ b/base/message_loop.h
@@ -14,6 +14,7 @@
#include "base/message_pump.h"
#include "base/observer_list.h"
#include "base/ref_counted.h"
+#include "base/scoped_ptr.h"
#include "base/task.h"
#include "base/timer.h"
diff --git a/base/message_pump_glib.h b/base/message_pump_glib.h
index 19d2ecd..d25ae86 100644
--- a/base/message_pump_glib.h
+++ b/base/message_pump_glib.h
@@ -8,7 +8,6 @@
#include <glib.h>
#include "base/message_pump.h"
-#include "base/scoped_ptr.h"
#include "base/time.h"
namespace base {
diff --git a/base/process_util_posix.cc b/base/process_util_posix.cc
index 19df763..37888d5 100644
--- a/base/process_util_posix.cc
+++ b/base/process_util_posix.cc
@@ -19,6 +19,7 @@
#include "base/logging.h"
#include "base/platform_thread.h"
#include "base/process_util.h"
+#include "base/scoped_ptr.h"
#include "base/sys_info.h"
#include "base/time.h"
diff --git a/base/stats_table.cc b/base/stats_table.cc
index 1a99b3c..d2b6a9e 100644
--- a/base/stats_table.cc
+++ b/base/stats_table.cc
@@ -7,6 +7,7 @@
#include "base/logging.h"
#include "base/platform_thread.h"
#include "base/process_util.h"
+#include "base/scoped_ptr.h"
#include "base/shared_memory.h"
#include "base/string_piece.h"
#include "base/string_util.h"
diff --git a/base/time_format.cc b/base/time_format.cc
index 887494f..e17b048 100644
--- a/base/time_format.cc
+++ b/base/time_format.cc
@@ -5,6 +5,7 @@
#include "base/time_format.h"
#include "base/logging.h"
+#include "base/scoped_ptr.h"
#include "base/string_util.h"
#include "base/time.h"
#include "unicode/datefmt.h"
diff --git a/base/win_util.cc b/base/win_util.cc
index fe6d6f0..2f1ceb9 100644
--- a/base/win_util.cc
+++ b/base/win_util.cc
@@ -10,6 +10,7 @@
#include "base/logging.h"
#include "base/registry.h"
#include "base/scoped_handle.h"
+#include "base/scoped_ptr.h"
#include "base/singleton.h"
#include "base/string_util.h"
#include "base/tracked.h"
diff --git a/chrome/browser/autocomplete/autocomplete_popup_model.h b/chrome/browser/autocomplete/autocomplete_popup_model.h
index fa2c81e..94772e6 100644
--- a/chrome/browser/autocomplete/autocomplete_popup_model.h
+++ b/chrome/browser/autocomplete/autocomplete_popup_model.h
@@ -5,6 +5,7 @@
#ifndef CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_MODEL_H_
#define CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_MODEL_H_
+#include "base/scoped_ptr.h"
#include "chrome/browser/autocomplete/autocomplete.h"
#include "chrome/common/notification_registrar.h"
diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc b/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc
index 4cd305f..94a6343 100755
--- a/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc
+++ b/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc
@@ -6,7 +6,6 @@
#include "base/gfx/gtk_util.h"
#include "base/logging.h"
-#include "base/scoped_ptr.h"
#include "base/string_util.h"
#include "chrome/browser/autocomplete/autocomplete.h"
#include "chrome/browser/autocomplete/autocomplete_edit.h"
diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_win.cc b/chrome/browser/autocomplete/autocomplete_popup_view_win.cc
index 1c13a6c..9e76de3 100755
--- a/chrome/browser/autocomplete/autocomplete_popup_view_win.cc
+++ b/chrome/browser/autocomplete/autocomplete_popup_view_win.cc
@@ -11,7 +11,6 @@
#include <atlmisc.h>
#include <cmath>
-#include "base/scoped_ptr.h"
#include "base/string_util.h"
#include "base/win_util.h"
#include "chrome/browser/autocomplete/autocomplete.h"
diff --git a/chrome/browser/browser.h b/chrome/browser/browser.h
index 025a8e5..b4d83ba 100644
--- a/chrome/browser/browser.h
+++ b/chrome/browser/browser.h
@@ -26,6 +26,7 @@
#include "chrome/common/notification_observer.h"
#include "chrome/common/pref_member.h"
#include "base/gfx/rect.h"
+#include "base/scoped_ptr.h"
#include "base/task.h"
#include "skia/include/SkBitmap.h"
diff --git a/chrome/browser/download/download_file.cc b/chrome/browser/download/download_file.cc
index b66bbcf..8a3444a 100644
--- a/chrome/browser/download/download_file.cc
+++ b/chrome/browser/download/download_file.cc
@@ -6,7 +6,6 @@
#include "base/file_util.h"
#include "base/path_service.h"
-#include "base/scoped_ptr.h"
#include "base/string_util.h"
#include "base/task.h"
#include "build/build_config.h"
diff --git a/chrome/browser/download/save_file_manager.cc b/chrome/browser/download/save_file_manager.cc
index a8806ab..9f444c50 100644
--- a/chrome/browser/download/save_file_manager.cc
+++ b/chrome/browser/download/save_file_manager.cc
@@ -8,7 +8,6 @@
#include "base/file_util.h"
#include "base/logging.h"
-#include "base/scoped_ptr.h"
#include "base/string_util.h"
#include "base/task.h"
#include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/external_protocol_handler.cc b/chrome/browser/external_protocol_handler.cc
index a24c4b3..98ab6f1 100644
--- a/chrome/browser/external_protocol_handler.cc
+++ b/chrome/browser/external_protocol_handler.cc
@@ -11,7 +11,6 @@
#include "base/logging.h"
#include "base/message_loop.h"
#include "base/registry.h"
-#include "base/scoped_ptr.h"
#include "base/string_util.h"
#include "base/thread.h"
#include "chrome/browser/browser.h"
diff --git a/chrome/browser/gtk/location_bar_view_gtk.h b/chrome/browser/gtk/location_bar_view_gtk.h
index a2a3208..d07091a 100644
--- a/chrome/browser/gtk/location_bar_view_gtk.h
+++ b/chrome/browser/gtk/location_bar_view_gtk.h
@@ -10,6 +10,7 @@
#include <string>
#include "base/basictypes.h"
+#include "base/scoped_ptr.h"
#include "chrome/browser/autocomplete/autocomplete_edit.h"
#include "chrome/browser/location_bar.h"
#include "chrome/common/page_transition_types.h"
diff --git a/chrome/browser/history/in_memory_history_backend.h b/chrome/browser/history/in_memory_history_backend.h
index ed9dabd..9b78294 100644
--- a/chrome/browser/history/in_memory_history_backend.h
+++ b/chrome/browser/history/in_memory_history_backend.h
@@ -16,6 +16,7 @@
#include <string>
#include "base/basictypes.h"
+#include "base/scoped_ptr.h"
#include "chrome/browser/history/history_notifications.h"
#include "chrome/common/notification_observer.h"
diff --git a/chrome/browser/renderer_host/render_widget_host.h b/chrome/browser/renderer_host/render_widget_host.h
index 6e80a9d..59235d0 100644
--- a/chrome/browser/renderer_host/render_widget_host.h
+++ b/chrome/browser/renderer_host/render_widget_host.h
@@ -9,6 +9,7 @@
#include <vector>
#include "base/gfx/size.h"
+#include "base/scoped_ptr.h"
#include "base/timer.h"
#include "chrome/common/ipc_channel.h"
#include "chrome/common/native_web_keyboard_event.h"
diff --git a/chrome/browser/search_engines/template_url_parser_unittest.cc b/chrome/browser/search_engines/template_url_parser_unittest.cc
index 4cb1fd2..bac35c4 100644
--- a/chrome/browser/search_engines/template_url_parser_unittest.cc
+++ b/chrome/browser/search_engines/template_url_parser_unittest.cc
@@ -5,7 +5,6 @@
#include "base/file_util.h"
#include "base/logging.h"
#include "base/path_service.h"
-#include "base/scoped_ptr.h"
#include "chrome/browser/search_engines/template_url.h"
#include "chrome/browser/search_engines/template_url_parser.h"
#include "chrome/common/chrome_paths.h"
diff --git a/chrome/browser/tab_contents/interstitial_page.h b/chrome/browser/tab_contents/interstitial_page.h
index 31176bc..0c9049c 100644
--- a/chrome/browser/tab_contents/interstitial_page.h
+++ b/chrome/browser/tab_contents/interstitial_page.h
@@ -8,6 +8,7 @@
#include <string>
#include "base/gfx/size.h"
+#include "base/scoped_ptr.h"
#include "chrome/browser/renderer_host/render_view_host_delegate.h"
#include "chrome/common/notification_registrar.h"
#include "googleurl/src/gurl.h"
diff --git a/chrome/browser/tab_contents/tab_contents.h b/chrome/browser/tab_contents/tab_contents.h
index d28e068..89b7430 100644
--- a/chrome/browser/tab_contents/tab_contents.h
+++ b/chrome/browser/tab_contents/tab_contents.h
@@ -12,6 +12,7 @@
#include "base/gfx/native_widget_types.h"
#include "base/gfx/rect.h"
+#include "base/scoped_ptr.h"
#if defined(OS_WIN)
// TODO(evanm): I mean really, c'mon, this can't have broken the build, right?
#include "chrome/browser/autocomplete/autocomplete_edit.h"
diff --git a/chrome/browser/tab_contents/web_contents_view_mac.h b/chrome/browser/tab_contents/web_contents_view_mac.h
index 59eb422..e7bffac 100644
--- a/chrome/browser/tab_contents/web_contents_view_mac.h
+++ b/chrome/browser/tab_contents/web_contents_view_mac.h
@@ -8,6 +8,7 @@
#import <Cocoa/Cocoa.h>
#include "base/gfx/size.h"
+#include "base/scoped_ptr.h"
#include "base/scoped_cftyperef.h"
#include "chrome/browser/cocoa/base_view.h"
#include "chrome/browser/tab_contents/web_contents_view.h"
diff --git a/chrome/browser/views/password_manager_exceptions_view.h b/chrome/browser/views/password_manager_exceptions_view.h
index 836c027..3313211 100644
--- a/chrome/browser/views/password_manager_exceptions_view.h
+++ b/chrome/browser/views/password_manager_exceptions_view.h
@@ -7,7 +7,6 @@
#include <vector>
-#include "base/scoped_ptr.h"
#include "chrome/browser/views/password_manager_view.h"
#include "chrome/browser/webdata/web_data_service.h"
#include "chrome/common/stl_util-inl.h"
diff --git a/chrome/browser/views/status_bubble_views.cc b/chrome/browser/views/status_bubble_views.cc
index bc2647db..144e3f1 100644
--- a/chrome/browser/views/status_bubble_views.cc
+++ b/chrome/browser/views/status_bubble_views.cc
@@ -6,7 +6,6 @@
#include <algorithm>
-#include "base/scoped_ptr.h"
#include "base/string_util.h"
#include "chrome/common/animation.h"
#include "chrome/common/gfx/chrome_canvas.h"
diff --git a/chrome/browser/worker_host/worker_process_host.h b/chrome/browser/worker_host/worker_process_host.h
index 40da66f..e0ff095 100644
--- a/chrome/browser/worker_host/worker_process_host.h
+++ b/chrome/browser/worker_host/worker_process_host.h
@@ -8,7 +8,6 @@
#include <list>
#include "base/basictypes.h"
-#include "base/scoped_ptr.h"
#include "chrome/common/child_process_host.h"
#include "chrome/common/ipc_channel.h"
#include "googleurl/src/gurl.h"
diff --git a/chrome/common/chrome_plugin_lib.h b/chrome/common/chrome_plugin_lib.h
index 21bf925..b2dca62 100644
--- a/chrome/common/chrome_plugin_lib.h
+++ b/chrome/common/chrome_plugin_lib.h
@@ -10,7 +10,6 @@
#include "base/basictypes.h"
#include "base/file_path.h"
#include "base/ref_counted.h"
-#include "base/scoped_ptr.h"
#include "chrome/common/chrome_plugin_api.h"
class MessageLoop;
diff --git a/chrome/common/libxml_utils.h b/chrome/common/libxml_utils.h
index af88ec9..1484139 100644
--- a/chrome/common/libxml_utils.h
+++ b/chrome/common/libxml_utils.h
@@ -9,7 +9,6 @@
#include "libxml/xmlreader.h"
#include "libxml/xmlwriter.h"
-#include "base/scoped_ptr.h"
// Converts a libxml xmlChar* into a UTF-8 std::string.
// NULL inputs produce an empty string.
diff --git a/chrome/common/resource_dispatcher_unittest.cc b/chrome/common/resource_dispatcher_unittest.cc
index a53f0c3..b473893 100644
--- a/chrome/common/resource_dispatcher_unittest.cc
+++ b/chrome/common/resource_dispatcher_unittest.cc
@@ -6,6 +6,7 @@
#include <vector>
#include "base/process.h"
+#include "base/scoped_ptr.h"
#include "chrome/common/filter_policy.h"
#include "chrome/common/render_messages.h"
#include "chrome/common/resource_dispatcher.h"
diff --git a/chrome/installer/util/helper_unittest.cc b/chrome/installer/util/helper_unittest.cc
index 7f34d3a..3152bc1 100644
--- a/chrome/installer/util/helper_unittest.cc
+++ b/chrome/installer/util/helper_unittest.cc
@@ -11,7 +11,6 @@
#include "base/file_util.h"
#include "base/path_service.h"
#include "base/process_util.h"
-#include "base/scoped_ptr.h"
#include "base/string_util.h"
#include "chrome/installer/util/helper.h"
#include "chrome/installer/util/work_item.h"
diff --git a/chrome/installer/util/install_util.cc b/chrome/installer/util/install_util.cc
index e6604d8..6fc0328 100644
--- a/chrome/installer/util/install_util.cc
+++ b/chrome/installer/util/install_util.cc
@@ -13,6 +13,7 @@
#include "base/logging.h"
#include "base/registry.h"
+#include "base/scoped_ptr.h"
#include "base/string_util.h"
#include "base/win_util.h"
diff --git a/chrome/installer/util/l10n_string_util.cc b/chrome/installer/util/l10n_string_util.cc
index 46ed565..ff4ec3f 100644
--- a/chrome/installer/util/l10n_string_util.cc
+++ b/chrome/installer/util/l10n_string_util.cc
@@ -4,6 +4,7 @@
#include <map>
#include "base/logging.h"
+#include "base/scoped_ptr.h"
#include "base/string_util.h"
#include "installer_util_strings.h"
diff --git a/chrome/views/link.cc b/chrome/views/link.cc
index 8fdd63d..93c1ff1 100644
--- a/chrome/views/link.cc
+++ b/chrome/views/link.cc
@@ -4,7 +4,6 @@
#include "chrome/views/link.h"
-#include "base/scoped_ptr.h"
#include "chrome/common/gfx/chrome_font.h"
#include "chrome/views/event.h"
diff --git a/chrome/views/repeat_controller.h b/chrome/views/repeat_controller.h
index 474d882..b7712d0 100644
--- a/chrome/views/repeat_controller.h
+++ b/chrome/views/repeat_controller.h
@@ -5,6 +5,7 @@
#ifndef CHROME_VIEWS_REPEAT_CONTROLLER_H_
#define CHROME_VIEWS_REPEAT_CONTROLLER_H_
+#include "base/scoped_ptr.h"
#include "base/timer.h"
namespace views {
diff --git a/chrome/views/tree_node_model.h b/chrome/views/tree_node_model.h
index eb7e290..4ca22b0 100644
--- a/chrome/views/tree_node_model.h
+++ b/chrome/views/tree_node_model.h
@@ -9,6 +9,7 @@
#include <vector>
#include "base/basictypes.h"
+#include "base/scoped_ptr.h"
#include "chrome/common/scoped_vector.h"
#include "chrome/views/tree_model.h"
diff --git a/media/base/mock_filter_host.h b/media/base/mock_filter_host.h
index 3af36ac..0a41397 100644
--- a/media/base/mock_filter_host.h
+++ b/media/base/mock_filter_host.h
@@ -12,6 +12,7 @@
#include <string>
+#include "base/scoped_ptr.h"
#include "media/base/factory.h"
#include "media/base/filter_host.h"
#include "media/base/filters.h"
diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
index 4344147..b0288a2 100644
--- a/media/filters/ffmpeg_demuxer.cc
+++ b/media/filters/ffmpeg_demuxer.cc
@@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "base/scoped_ptr.h"
#include "base/string_util.h"
#include "base/time.h"
#include "media/base/filter_host.h"
diff --git a/media/filters/null_audio_renderer.h b/media/filters/null_audio_renderer.h
index 2b6c092..cf66648 100644
--- a/media/filters/null_audio_renderer.h
+++ b/media/filters/null_audio_renderer.h
@@ -21,6 +21,7 @@
#include "base/lock.h"
#include "base/platform_thread.h"
+#include "base/scoped_ptr.h"
#include "media/base/buffers.h"
#include "media/base/factory.h"
#include "media/base/filters.h"
diff --git a/net/base/client_socket_pool.h b/net/base/client_socket_pool.h
index df2d043..a313a80 100644
--- a/net/base/client_socket_pool.h
+++ b/net/base/client_socket_pool.h
@@ -10,6 +10,7 @@
#include <string>
#include "base/ref_counted.h"
+#include "base/scoped_ptr.h"
#include "base/timer.h"
#include "net/base/completion_callback.h"
diff --git a/net/base/net_util.cc b/net/base/net_util.cc
index f16ab2e..6171db3 100644
--- a/net/base/net_util.cc
+++ b/net/base/net_util.cc
@@ -30,7 +30,6 @@
#include "base/file_util.h"
#include "base/logging.h"
#include "base/path_service.h"
-#include "base/scoped_ptr.h"
#include "base/string_escape.h"
#include "base/string_piece.h"
#include "base/string_tokenizer.h"
diff --git a/net/base/tcp_client_socket.h b/net/base/tcp_client_socket.h
index 76d2b1c6..b846836 100644
--- a/net/base/tcp_client_socket.h
+++ b/net/base/tcp_client_socket.h
@@ -17,7 +17,6 @@ struct event; // From libevent
#include "base/message_loop.h"
#endif
-#include "base/scoped_ptr.h"
#include "net/base/address_list.h"
#include "net/base/client_socket.h"
#include "net/base/completion_callback.h"
diff --git a/net/disk_cache/entry_impl.h b/net/disk_cache/entry_impl.h
index 67451fe..71a960a 100644
--- a/net/disk_cache/entry_impl.h
+++ b/net/disk_cache/entry_impl.h
@@ -5,6 +5,7 @@
#ifndef NET_DISK_CACHE_ENTRY_IMPL_H_
#define NET_DISK_CACHE_ENTRY_IMPL_H_
+#include "base/scoped_ptr.h"
#include "net/disk_cache/disk_cache.h"
#include "net/disk_cache/storage_block.h"
#include "net/disk_cache/storage_block-inl.h"
diff --git a/net/url_request/url_request_context.h b/net/url_request/url_request_context.h
index ba2a11c..e02cedd 100644
--- a/net/url_request/url_request_context.h
+++ b/net/url_request/url_request_context.h
@@ -11,7 +11,6 @@
#define NET_URL_REQUEST_URL_REQUEST_CONTEXT_H_
#include "base/ref_counted.h"
-#include "base/scoped_ptr.h"
#include "base/string_util.h"
#include "net/base/cookie_policy.h"
#include "net/ftp/ftp_auth_cache.h"
diff --git a/sandbox/src/job_unittest.cc b/sandbox/src/job_unittest.cc
index 1948e1f..d7d29ae 100644
--- a/sandbox/src/job_unittest.cc
+++ b/sandbox/src/job_unittest.cc
@@ -4,7 +4,6 @@
// This file contains unit tests for the job object.
-#include "base/scoped_ptr.h"
#include "sandbox/src/job.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/sandbox/src/named_pipe_policy.cc b/sandbox/src/named_pipe_policy.cc
index c08c00a..00182cf 100644
--- a/sandbox/src/named_pipe_policy.cc
+++ b/sandbox/src/named_pipe_policy.cc
@@ -6,7 +6,6 @@
#include <string>
-#include "base/scoped_ptr.h"
#include "sandbox/src/ipc_tags.h"
#include "sandbox/src/policy_engine_opcodes.h"
#include "sandbox/src/policy_params.h"
diff --git a/sandbox/src/restricted_token_unittest.cc b/sandbox/src/restricted_token_unittest.cc
index b159b96..d8fe233 100644
--- a/sandbox/src/restricted_token_unittest.cc
+++ b/sandbox/src/restricted_token_unittest.cc
@@ -8,7 +8,6 @@
#include <atlbase.h>
#include <atlsecurity.h>
#include <vector>
-#include "base/scoped_ptr.h"
#include "sandbox/src/restricted_token.h"
#include "sandbox/src/sid.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/sandbox/src/win_utils.cc b/sandbox/src/win_utils.cc
index a69e6f7..aa13bda 100644
--- a/sandbox/src/win_utils.cc
+++ b/sandbox/src/win_utils.cc
@@ -7,6 +7,7 @@
#include <map>
#include "base/logging.h"
+#include "base/scoped_ptr.h"
#include "sandbox/src/internal_types.h"
#include "sandbox/src/nt_internals.h"
diff --git a/sandbox/src/win_utils.h b/sandbox/src/win_utils.h
index 8d9bab4..b3aad3f 100644
--- a/sandbox/src/win_utils.h
+++ b/sandbox/src/win_utils.h
@@ -8,7 +8,6 @@
#include <windows.h>
#include <string>
#include "base/basictypes.h"
-#include "base/scoped_ptr.h"
namespace sandbox {
diff --git a/webkit/activex_shim/dispatch_object.h b/webkit/activex_shim/dispatch_object.h
index 1dc63a9..91e4a58 100644
--- a/webkit/activex_shim/dispatch_object.h
+++ b/webkit/activex_shim/dispatch_object.h
@@ -9,7 +9,6 @@
#include <list>
-#include "base/scoped_ptr.h"
#include "webkit/glue/plugins/nphostapi.h"
namespace activex_shim {
diff --git a/webkit/glue/autocomplete_input_listener.h b/webkit/glue/autocomplete_input_listener.h
index f9b403c..5f90e98 100644
--- a/webkit/glue/autocomplete_input_listener.h
+++ b/webkit/glue/autocomplete_input_listener.h
@@ -21,7 +21,6 @@ MSVC_PUSH_WARNING_LEVEL(0);
MSVC_POP_WARNING();
#include "base/basictypes.h"
-#include "base/scoped_ptr.h"
namespace WebCore {
class AtomicString;
diff --git a/webkit/glue/glue_serialize.cc b/webkit/glue/glue_serialize.cc
index 58d1a59..ecf6879 100644
--- a/webkit/glue/glue_serialize.cc
+++ b/webkit/glue/glue_serialize.cc
@@ -17,7 +17,6 @@ MSVC_POP_WARNING();
#include "webkit/glue/glue_serialize.h"
#include "base/pickle.h"
-#include "base/scoped_ptr.h"
#include "base/string_util.h"
#include "webkit/glue/glue_util.h"
#include "webkit/glue/webkit_glue.h"
diff --git a/webkit/glue/image_decoder.h b/webkit/glue/image_decoder.h
index 058c35f..b2f9b0d 100644
--- a/webkit/glue/image_decoder.h
+++ b/webkit/glue/image_decoder.h
@@ -4,7 +4,6 @@
#include "base/basictypes.h"
#include "base/gfx/size.h"
-#include "base/scoped_ptr.h"
class SkBitmap;
diff --git a/webkit/glue/plugins/plugin_lib.h b/webkit/glue/plugins/plugin_lib.h
index 7207bc4..0b44212 100644
--- a/webkit/glue/plugins/plugin_lib.h
+++ b/webkit/glue/plugins/plugin_lib.h
@@ -13,7 +13,6 @@
#include "base/basictypes.h"
#include "base/file_path.h"
#include "base/ref_counted.h"
-#include "base/scoped_ptr.h"
#include "webkit/glue/plugins/plugin_list.h"
#include "webkit/glue/webplugin.h"
diff --git a/webkit/glue/webkitclient_impl.h b/webkit/glue/webkitclient_impl.h
index ab6926b..a04831b 100644
--- a/webkit/glue/webkitclient_impl.h
+++ b/webkit/glue/webkitclient_impl.h
@@ -7,7 +7,6 @@
#include "WebKitClient.h"
-#include "base/scoped_ptr.h"
#include "base/timer.h"
#include "webkit/glue/webclipboard_impl.h"
diff --git a/webkit/glue/webplugin_impl.h b/webkit/glue/webplugin_impl.h
index 1a580f4..4736510 100644
--- a/webkit/glue/webplugin_impl.h
+++ b/webkit/glue/webplugin_impl.h
@@ -21,7 +21,6 @@ MSVC_PUSH_WARNING_LEVEL(0);
MSVC_POP_WARNING();
#include "base/basictypes.h"
-#include "base/scoped_ptr.h"
#include "webkit/glue/webframe_impl.h"
#include "webkit/glue/webplugin.h"
#include "webkit/glue/webplugin_delegate.h"
diff --git a/webkit/tools/test_shell/plugin_tests.cc b/webkit/tools/test_shell/plugin_tests.cc
index f25c83c..ad06166 100644
--- a/webkit/tools/test_shell/plugin_tests.cc
+++ b/webkit/tools/test_shell/plugin_tests.cc
@@ -6,7 +6,6 @@
#include "base/file_util.h"
#include "base/message_loop.h"
-#include "base/scoped_ptr.h"
#include "base/string_util.h"
#include "net/base/cookie_monster.h"
#include "net/base/net_util.h"
diff --git a/webkit/tools/test_shell/webview_host.h b/webkit/tools/test_shell/webview_host.h
index c1bee42..337a355 100644
--- a/webkit/tools/test_shell/webview_host.h
+++ b/webkit/tools/test_shell/webview_host.h
@@ -8,7 +8,6 @@
#include "base/basictypes.h"
#include "base/gfx/native_widget_types.h"
#include "base/gfx/rect.h"
-#include "base/scoped_ptr.h"
#include "webkit/tools/test_shell/webwidget_host.h"
struct WebPreferences;