Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(784)

Unified Diff: chrome/browser/sync/util/character_set_converters_unittest.cc

Issue 193103: Build sync engine as part of the browser build (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/sync/util/character_set_converters-win32.cc ('k') | chrome/browser/sync/util/compat-file.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/util/character_set_converters_unittest.cc
===================================================================
--- chrome/browser/sync/util/character_set_converters_unittest.cc (revision 26149)
+++ chrome/browser/sync/util/character_set_converters_unittest.cc (working copy)
@@ -7,6 +7,7 @@
#include <string>
#include "base/basictypes.h"
+#include "build/build_config.h"
#include "testing/gtest/include/gtest/gtest.h"
using browser_sync::ToPathString;
@@ -34,7 +35,7 @@
ToPathString to_16(ascii);
ASSERT_TRUE(to_16.good());
ASSERT_TRUE(PathString(wide) == to_16.get_string16());
-#ifdef OS_WINDOWS
+#ifdef OS_WIN
// On Linux, PathString is already UTF8
ASSERT_EQ(string(ascii), static_cast<string>(ToUTF8(wide)));
#endif
@@ -43,7 +44,7 @@
// ASSERT_TRUE(wide == ToPathString(utf8).get_string16());
}
-#ifdef OS_WINDOWS
+#ifdef OS_WIN
// On Linux, PathString is already UTF8
TEST_F(CharacterSetConverterTest, UnicodeConversionText) {
// Source data obtained by running od -b on files saved in utf-8 and unicode
@@ -107,7 +108,7 @@
ASSERT_TRUE(out == PathString(PSTR("onetwothree")));
}
-#ifdef OS_WINDOWS
+#ifdef OS_WIN
namespace {
// See http://en.wikipedia.org/wiki/UTF-16 for an explanation of UTF16.
// For a test case we use the UTF-8 and UTF-16 encoding of char 119070
« no previous file with comments | « chrome/browser/sync/util/character_set_converters-win32.cc ('k') | chrome/browser/sync/util/compat-file.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698