summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-05 05:12:35 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-05 05:12:35 +0000
commitde6b8b6dddc04caaa197cc32e6399553c8e81633 (patch)
tree0b19e26733d3b194185fcb65a6fde5a46441cc2a /base
parent49abd659faa7286eddef29dea766d7a637473672 (diff)
downloadchromium_src-de6b8b6dddc04caaa197cc32e6399553c8e81633.zip
chromium_src-de6b8b6dddc04caaa197cc32e6399553c8e81633.tar.gz
chromium_src-de6b8b6dddc04caaa197cc32e6399553c8e81633.tar.bz2
FBTF: Remove unneeded headers from base/ (part 1)
BUG=none TEST=none Review URL: http://codereview.chromium.org/3071012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55034 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r--base/crypto/symmetric_key_mac.cc1
-rw-r--r--base/file_path.cc7
-rw-r--r--base/message_pump_win.cc1
-rw-r--r--base/process_util_posix.cc2
-rw-r--r--base/shared_memory_win.cc1
-rw-r--r--base/trace_event_win.cc2
-rw-r--r--base/win_util_unittest.cc1
7 files changed, 5 insertions, 10 deletions
diff --git a/base/crypto/symmetric_key_mac.cc b/base/crypto/symmetric_key_mac.cc
index 778a5dc..574f9d2 100644
--- a/base/crypto/symmetric_key_mac.cc
+++ b/base/crypto/symmetric_key_mac.cc
@@ -10,7 +10,6 @@
#include "base/crypto/cssm_init.h"
#include "base/logging.h"
-#include "base/rand_util.h"
namespace {
diff --git a/base/file_path.cc b/base/file_path.cc
index 24a798e..e330e3c 100644
--- a/base/file_path.cc
+++ b/base/file_path.cc
@@ -4,7 +4,9 @@
#include "base/file_path.h"
-#if defined(OS_MACOSX)
+#if defined(OS_WIN)
+#include <windows.h>
+#elif defined(OS_MACOSX)
#include <CoreServices/CoreServices.h>
#endif
@@ -22,9 +24,6 @@
#include "base/scoped_cftyperef.h"
#include "base/third_party/icu/icu_utf.h"
#endif
-#if defined(OS_WIN)
-#include "base/win_util.h"
-#endif
#if defined(FILE_PATH_USES_WIN_SEPARATORS)
const FilePath::CharType FilePath::kSeparators[] = FILE_PATH_LITERAL("\\/");
diff --git a/base/message_pump_win.cc b/base/message_pump_win.cc
index 6fa3e7d..fc4b2e4 100644
--- a/base/message_pump_win.cc
+++ b/base/message_pump_win.cc
@@ -7,7 +7,6 @@
#include <math.h>
#include "base/histogram.h"
-#include "base/win_util.h"
using base::Time;
diff --git a/base/process_util_posix.cc b/base/process_util_posix.cc
index 3455a43..d427cea 100644
--- a/base/process_util_posix.cc
+++ b/base/process_util_posix.cc
@@ -24,7 +24,6 @@
#include "base/logging.h"
#include "base/platform_thread.h"
#include "base/process_util.h"
-#include "base/rand_util.h"
#include "base/scoped_ptr.h"
#include "base/string_util.h"
#include "base/time.h"
@@ -34,6 +33,7 @@
#include <crt_externs.h>
#define environ (*_NSGetEnviron())
#include "base/mach_ipc_mac.h"
+#include "base/rand_util.h"
#else
extern char** environ;
#endif
diff --git a/base/shared_memory_win.cc b/base/shared_memory_win.cc
index 7d3e4cd..7974e14 100644
--- a/base/shared_memory_win.cc
+++ b/base/shared_memory_win.cc
@@ -5,7 +5,6 @@
#include "base/shared_memory.h"
#include "base/logging.h"
-#include "base/win_util.h"
namespace base {
diff --git a/base/trace_event_win.cc b/base/trace_event_win.cc
index eae6782..12673e9 100644
--- a/base/trace_event_win.cc
+++ b/base/trace_event_win.cc
@@ -4,7 +4,7 @@
#include "base/trace_event_win.h"
#include "base/atomicops.h"
-#include "base/logging_win.h"
+#include "base/logging.h"
#include "base/singleton.h"
#include <initguid.h> // NOLINT
diff --git a/base/win_util_unittest.cc b/base/win_util_unittest.cc
index 39162a5..f20e7d2 100644
--- a/base/win_util_unittest.cc
+++ b/base/win_util_unittest.cc
@@ -5,7 +5,6 @@
#include <windows.h>
#include "testing/gtest/include/gtest/gtest.h"
-#include "base/registry.h"
#include "base/string_util.h"
#include "base/win_util.h"