summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--base/waitable_event.h1
-rw-r--r--chrome/browser/autocomplete/autocomplete_unittest.cc1
-rw-r--r--chrome/browser/autocomplete/history_url_provider.h1
-rw-r--r--chrome/browser/bookmarks/bookmark_service.h2
-rw-r--r--chrome/browser/extensions/extension_error_reporter.h1
-rw-r--r--chrome/browser/gears_integration.cc1
-rw-r--r--chrome/browser/history/history_types.h1
-rw-r--r--chrome/browser/net/dns_master.cc1
-rw-r--r--chrome/browser/tab_contents/navigation_controller.h1
-rw-r--r--chrome/browser/views/first_run_view_base.cc1
-rw-r--r--chrome/views/widget/root_view.h5
-rw-r--r--net/base/ssl_client_socket_unittest.cc1
-rw-r--r--net/base/ssl_test_util.h4
-rw-r--r--net/disk_cache/mapped_file.h1
-rw-r--r--net/http/http_auth.h3
-rw-r--r--net/http/http_vary_data.h1
-rwxr-xr-xskia/ext/bitmap_platform_device_mac.cc2
-rwxr-xr-xskia/ext/bitmap_platform_device_mac.h2
-rw-r--r--webkit/glue/plugins/plugin_list.h1
-rw-r--r--webkit/tools/test_shell/event_sending_controller.cc1
20 files changed, 10 insertions, 22 deletions
diff --git a/base/waitable_event.h b/base/waitable_event.h
index 28c130b..73fc7ff5 100644
--- a/base/waitable_event.h
+++ b/base/waitable_event.h
@@ -16,7 +16,6 @@
#include <utility>
#include "base/condition_variable.h"
#include "base/lock.h"
-#include "base/ref_counted.h"
#endif
#include "base/message_loop.h"
diff --git a/chrome/browser/autocomplete/autocomplete_unittest.cc b/chrome/browser/autocomplete/autocomplete_unittest.cc
index e99fabd..1316eeb 100644
--- a/chrome/browser/autocomplete/autocomplete_unittest.cc
+++ b/chrome/browser/autocomplete/autocomplete_unittest.cc
@@ -3,7 +3,6 @@
// found in the LICENSE file.
#include "base/message_loop.h"
-#include "base/ref_counted.h"
#include "base/string_util.h"
#include "chrome/browser/autocomplete/autocomplete.h"
#include "chrome/common/notification_registrar.h"
diff --git a/chrome/browser/autocomplete/history_url_provider.h b/chrome/browser/autocomplete/history_url_provider.h
index 0c1260a..1b262f3 100644
--- a/chrome/browser/autocomplete/history_url_provider.h
+++ b/chrome/browser/autocomplete/history_url_provider.h
@@ -9,7 +9,6 @@
#include <vector>
#include <deque>
-#include "base/ref_counted.h"
#include "chrome/browser/autocomplete/autocomplete.h"
#include "chrome/browser/history/history_database.h"
#include "chrome/browser/profile.h"
diff --git a/chrome/browser/bookmarks/bookmark_service.h b/chrome/browser/bookmarks/bookmark_service.h
index 30387a3..2de91cf 100644
--- a/chrome/browser/bookmarks/bookmark_service.h
+++ b/chrome/browser/bookmarks/bookmark_service.h
@@ -32,8 +32,6 @@
#include <vector>
-#include "base/ref_counted.h"
-
class GURL;
// BookmarkService provides a thread safe view of bookmarks. It is used by
diff --git a/chrome/browser/extensions/extension_error_reporter.h b/chrome/browser/extensions/extension_error_reporter.h
index 151edd5..b85927f 100644
--- a/chrome/browser/extensions/extension_error_reporter.h
+++ b/chrome/browser/extensions/extension_error_reporter.h
@@ -9,7 +9,6 @@
#include <vector>
#include "base/message_loop.h"
-#include "base/ref_counted.h"
// Exposes an easy way for the various components of the extension system to
// report errors. This is a singleton that lives on the UI thread, with the
diff --git a/chrome/browser/gears_integration.cc b/chrome/browser/gears_integration.cc
index 863969a..92f031f 100644
--- a/chrome/browser/gears_integration.cc
+++ b/chrome/browser/gears_integration.cc
@@ -7,7 +7,6 @@
#include "base/gfx/png_encoder.h"
#include "base/logging.h"
#include "base/message_loop.h"
-#include "base/ref_counted.h"
#include "base/string_util.h"
#include "chrome/browser/chrome_plugin_host.h"
#include "chrome/common/chrome_plugin_util.h"
diff --git a/chrome/browser/history/history_types.h b/chrome/browser/history/history_types.h
index ecd39f6..62d737d 100644
--- a/chrome/browser/history/history_types.h
+++ b/chrome/browser/history/history_types.h
@@ -12,7 +12,6 @@
#include "base/basictypes.h"
#include "base/gfx/rect.h"
-#include "base/ref_counted.h"
#include "base/stack_container.h"
#include "base/time.h"
#include "chrome/browser/history/snippet.h"
diff --git a/chrome/browser/net/dns_master.cc b/chrome/browser/net/dns_master.cc
index dd8aae0..de11d50 100644
--- a/chrome/browser/net/dns_master.cc
+++ b/chrome/browser/net/dns_master.cc
@@ -11,7 +11,6 @@
#include "base/compiler_specific.h"
#include "base/histogram.h"
#include "base/lock.h"
-#include "base/ref_counted.h"
#include "base/stats_counters.h"
#include "base/string_util.h"
#include "base/time.h"
diff --git a/chrome/browser/tab_contents/navigation_controller.h b/chrome/browser/tab_contents/navigation_controller.h
index 3de03e5..41502d6 100644
--- a/chrome/browser/tab_contents/navigation_controller.h
+++ b/chrome/browser/tab_contents/navigation_controller.h
@@ -10,7 +10,6 @@
#include "build/build_config.h"
#include "base/linked_ptr.h"
-#include "base/ref_counted.h"
#include "base/string16.h"
#include "googleurl/src/gurl.h"
#include "chrome/browser/sessions/session_id.h"
diff --git a/chrome/browser/views/first_run_view_base.cc b/chrome/browser/views/first_run_view_base.cc
index 124c05e..90b04d3 100644
--- a/chrome/browser/views/first_run_view_base.cc
+++ b/chrome/browser/views/first_run_view_base.cc
@@ -6,7 +6,6 @@
#include "base/command_line.h"
#include "base/path_service.h"
-#include "base/ref_counted.h"
#include "base/thread.h"
#include "chrome/browser/browser_list.h"
#include "chrome/browser/browser_process.h"
diff --git a/chrome/views/widget/root_view.h b/chrome/views/widget/root_view.h
index 802e7b5..adccb9c 100644
--- a/chrome/views/widget/root_view.h
+++ b/chrome/views/widget/root_view.h
@@ -5,7 +5,12 @@
#ifndef CHROME_VIEWS_WIDGET_ROOT_VIEW_H_
#define CHROME_VIEWS_WIDGET_ROOT_VIEW_H_
+#include "build/build_config.h"
+
+#if defined(OS_WIN)
#include "base/ref_counted.h"
+#endif
+
#include "chrome/views/focus/focus_manager.h"
#include "chrome/views/view.h"
diff --git a/net/base/ssl_client_socket_unittest.cc b/net/base/ssl_client_socket_unittest.cc
index c8b87f4..2148dfb 100644
--- a/net/base/ssl_client_socket_unittest.cc
+++ b/net/base/ssl_client_socket_unittest.cc
@@ -2,7 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/ref_counted.h"
#include "net/base/address_list.h"
#include "net/base/client_socket_factory.h"
#include "net/base/host_resolver.h"
diff --git a/net/base/ssl_test_util.h b/net/base/ssl_test_util.h
index 67b550c..b75453b 100644
--- a/net/base/ssl_test_util.h
+++ b/net/base/ssl_test_util.h
@@ -5,12 +5,12 @@
#ifndef NET_BASE_SSL_TEST_UTIL_H_
#define NET_BASE_SSL_TEST_UTIL_H_
+#include "build/build_config.h"
+
#include <string>
#include "base/file_path.h"
#include "base/process_util.h"
-#include "base/ref_counted.h"
-#include "build/build_config.h"
// TODO(dkegel): share this between net/base and
// chrome/browser without putting it in net.lib
diff --git a/net/disk_cache/mapped_file.h b/net/disk_cache/mapped_file.h
index bf12df3..215a892 100644
--- a/net/disk_cache/mapped_file.h
+++ b/net/disk_cache/mapped_file.h
@@ -9,7 +9,6 @@
#include <string>
-#include "base/ref_counted.h"
#include "net/disk_cache/disk_format.h"
#include "net/disk_cache/file.h"
#include "net/disk_cache/file_block.h"
diff --git a/net/http/http_auth.h b/net/http/http_auth.h
index 041581e..8f594e2 100644
--- a/net/http/http_auth.h
+++ b/net/http/http_auth.h
@@ -5,9 +5,10 @@
#ifndef NET_HTTP_HTTP_AUTH_H_
#define NET_HTTP_HTTP_AUTH_H_
-#include "base/ref_counted.h"
#include "net/http/http_util.h"
+template <class T> class scoped_refptr;
+
namespace net {
class HttpAuthHandler;
diff --git a/net/http/http_vary_data.h b/net/http/http_vary_data.h
index 5ce90c8..a96abe0 100644
--- a/net/http/http_vary_data.h
+++ b/net/http/http_vary_data.h
@@ -6,7 +6,6 @@
#define NET_HTTP_HTTP_VARY_DATA_H__
#include "base/md5.h"
-#include "base/ref_counted.h"
class Pickle;
diff --git a/skia/ext/bitmap_platform_device_mac.cc b/skia/ext/bitmap_platform_device_mac.cc
index a3f5e74..f752d3d 100755
--- a/skia/ext/bitmap_platform_device_mac.cc
+++ b/skia/ext/bitmap_platform_device_mac.cc
@@ -11,6 +11,7 @@
#include "SkTypes.h"
#include "SkUtils.h"
+#include "base/ref_counted.h"
#include "skia/ext/skia_utils_mac.h"
namespace skia {
@@ -295,4 +296,3 @@ void BitmapPlatformDeviceMac::processPixels(int x, int y,
}
} // namespace skia
-
diff --git a/skia/ext/bitmap_platform_device_mac.h b/skia/ext/bitmap_platform_device_mac.h
index 7116a1b..0cf483f 100755
--- a/skia/ext/bitmap_platform_device_mac.h
+++ b/skia/ext/bitmap_platform_device_mac.h
@@ -5,7 +5,6 @@
#ifndef SKIA_EXT_BITMAP_PLATFORM_DEVICE_MAC_H_
#define SKIA_EXT_BITMAP_PLATFORM_DEVICE_MAC_H_
-#include "base/ref_counted.h"
#include "skia/ext/platform_device_mac.h"
namespace skia {
@@ -92,4 +91,3 @@ class BitmapPlatformDeviceMac : public PlatformDeviceMac {
} // namespace skia
#endif // SKIA_EXT_BITMAP_PLATFORM_DEVICE_MAC_H_
-
diff --git a/webkit/glue/plugins/plugin_list.h b/webkit/glue/plugins/plugin_list.h
index eaee2d1..d2d14d1 100644
--- a/webkit/glue/plugins/plugin_list.h
+++ b/webkit/glue/plugins/plugin_list.h
@@ -11,7 +11,6 @@
#include "base/basictypes.h"
#include "base/file_path.h"
-#include "base/ref_counted.h"
#include "webkit/glue/webplugin.h"
#include "webkit/glue/plugins/nphostapi.h"
diff --git a/webkit/tools/test_shell/event_sending_controller.cc b/webkit/tools/test_shell/event_sending_controller.cc
index 923d784..6fadaa3 100644
--- a/webkit/tools/test_shell/event_sending_controller.cc
+++ b/webkit/tools/test_shell/event_sending_controller.cc
@@ -26,7 +26,6 @@
#include "base/compiler_specific.h"
#include "base/logging.h"
#include "base/message_loop.h"
-#include "base/ref_counted.h"
#include "base/string_util.h"
#include "base/time.h"
#include "webkit/glue/webinputevent_util.h"