summaryrefslogtreecommitdiffstats
path: root/base/utf_string_conversions_unittest.cc
diff options
context:
space:
mode:
authorjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-09 00:38:41 +0000
committerjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-09 00:38:41 +0000
commit379e7a5a9b6934dca457eb3eaeb66a05a8946a8a (patch)
tree7fb61b6338cab5433fdf57517d9e56f23dac881c /base/utf_string_conversions_unittest.cc
parent0ef51cc6d25951d6dbaf4d8036d00b3316059ce9 (diff)
downloadchromium_src-379e7a5a9b6934dca457eb3eaeb66a05a8946a8a.zip
chromium_src-379e7a5a9b6934dca457eb3eaeb66a05a8946a8a.tar.gz
chromium_src-379e7a5a9b6934dca457eb3eaeb66a05a8946a8a.tar.bz2
base: string_util.h -> utf_string_conversions.h fix.
BUG=none TEST=none Review URL: http://codereview.chromium.org/678001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40972 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/utf_string_conversions_unittest.cc')
-rw-r--r--base/utf_string_conversions_unittest.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/base/utf_string_conversions_unittest.cc b/base/utf_string_conversions_unittest.cc
index 6ba0b5b..01a4125 100644
--- a/base/utf_string_conversions_unittest.cc
+++ b/base/utf_string_conversions_unittest.cc
@@ -3,7 +3,9 @@
// found in the LICENSE file.
#include "base/basictypes.h"
+#include "base/logging.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace base {
@@ -24,7 +26,7 @@ string16 BuildString16(const wchar_t* s) {
#elif defined(WCHAR_T_IS_UTF32)
string16 u16;
while (*s != 0) {
- DCHECK(static_cast<unsigned int>(*s) <= 0xFFFFu);
+ DCHECK_LE(static_cast<unsigned int>(*s), 0xFFFFu);
u16.push_back(*s++);
}
return u16;
@@ -226,4 +228,4 @@ TEST(UTFStringConversionsTest, ConvertMultiString) {
EXPECT_EQ(expected, converted);
}
-} // namaspace base
+} // base