summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-03 14:35:22 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-03 14:35:22 +0000
commitbe1ce6a7b2fa7e9622e5b249abd5fab478b6ca05 (patch)
treef8979e84e75cefbc8dc28180a7a6b99f5a0e34ed /base
parente28976b97eba6f8b7e5b39dba4f684c3ba6b2a6c (diff)
downloadchromium_src-be1ce6a7b2fa7e9622e5b249abd5fab478b6ca05.zip
chromium_src-be1ce6a7b2fa7e9622e5b249abd5fab478b6ca05.tar.gz
chromium_src-be1ce6a7b2fa7e9622e5b249abd5fab478b6ca05.tar.bz2
Add #include utf_string_conversions.h to all files that use ASCIIToWide and
ASCIIToUTF16. I removed string_util includes from a few places where it obviously wasn't needed. In a separate pass, I'm going to remove ASCIITo* from string_util, then I'm going to do an even later pass to find the unnecessary string_util.h includes and remove them. TEST=it compiles BUG=none Review URL: http://codereview.chromium.org/3058027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54746 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r--base/file_util_win.cc1
-rw-r--r--base/native_library_win.cc2
-rw-r--r--base/process_util_unittest.cc3
-rw-r--r--base/string16_unittest.cc1
-rw-r--r--base/values_unittest.cc1
5 files changed, 6 insertions, 2 deletions
diff --git a/base/file_util_win.cc b/base/file_util_win.cc
index aa965bf..4adab2c 100644
--- a/base/file_util_win.cc
+++ b/base/file_util_win.cc
@@ -20,6 +20,7 @@
#include "base/string_number_conversions.h"
#include "base/string_util.h"
#include "base/time.h"
+#include "base/utf_string_conversions.h"
#include "base/win_util.h"
namespace file_util {
diff --git a/base/native_library_win.cc b/base/native_library_win.cc
index 1c7accf..94e4b63 100644
--- a/base/native_library_win.cc
+++ b/base/native_library_win.cc
@@ -7,7 +7,7 @@
#include <windows.h>
#include "base/file_util.h"
-#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
namespace base {
diff --git a/base/process_util_unittest.cc b/base/process_util_unittest.cc
index 92031c9..8da89b0 100644
--- a/base/process_util_unittest.cc
+++ b/base/process_util_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -14,6 +14,7 @@
#include "base/platform_thread.h"
#include "base/process_util.h"
#include "base/scoped_ptr.h"
+#include "base/utf_string_conversions.h"
#include "testing/gtest/include/gtest/gtest.h"
#if defined(OS_LINUX)
diff --git a/base/string16_unittest.cc b/base/string16_unittest.cc
index 69eed4b..06b3dca 100644
--- a/base/string16_unittest.cc
+++ b/base/string16_unittest.cc
@@ -5,6 +5,7 @@
#include <sstream>
#include "base/string16.h"
+#include "base/utf_string_conversions.h"
#include "testing/gtest/include/gtest/gtest.h"
#if defined(WCHAR_T_IS_UTF32)
diff --git a/base/values_unittest.cc b/base/values_unittest.cc
index 71eec5e..f0b9d9e 100644
--- a/base/values_unittest.cc
+++ b/base/values_unittest.cc
@@ -7,6 +7,7 @@
#include "base/scoped_ptr.h"
#include "base/string_util.h"
#include "base/string16.h"
+#include "base/utf_string_conversions.h"
#include "base/values.h"
#include "testing/gtest/include/gtest/gtest.h"