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

Side by Side Diff: url/gurl_test_main.cc

Issue 14371002: url: Fix the include paths to icu unicode APIs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « url/DEPS ('k') | url/url_canon_icu.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2007, Google Inc. 1 // Copyright 2007, Google Inc.
2 // All rights reserved. 2 // All rights reserved.
3 // 3 //
4 // Redistribution and use in source and binary forms, with or without 4 // Redistribution and use in source and binary forms, with or without
5 // modification, are permitted provided that the following conditions are 5 // modification, are permitted provided that the following conditions are
6 // met: 6 // met:
7 // 7 //
8 // * Redistributions of source code must retain the above copyright 8 // * Redistributions of source code must retain the above copyright
9 // notice, this list of conditions and the following disclaimer. 9 // notice, this list of conditions and the following disclaimer.
10 // * Redistributions in binary form must reproduce the above 10 // * Redistributions in binary form must reproduce the above
(...skipping 18 matching lines...) Expand all
29 29
30 #include "build/build_config.h" 30 #include "build/build_config.h"
31 31
32 #if defined(OS_WIN) 32 #if defined(OS_WIN)
33 #include <windows.h> 33 #include <windows.h>
34 #endif 34 #endif
35 35
36 #include <string> 36 #include <string>
37 37
38 #include "testing/gtest/include/gtest/gtest.h" 38 #include "testing/gtest/include/gtest/gtest.h"
39 #include "unicode/putil.h" 39 #include "third_party/icu/public/common/unicode/putil.h"
40 #include "unicode/udata.h" 40 #include "third_party/icu/public/common/unicode/udata.h"
41 41
42 #define ICU_UTIL_DATA_SHARED 1 42 #define ICU_UTIL_DATA_SHARED 1
43 #define ICU_UTIL_DATA_STATIC 2 43 #define ICU_UTIL_DATA_STATIC 2
44 44
45 #ifndef ICU_UTIL_DATA_IMPL 45 #ifndef ICU_UTIL_DATA_IMPL
46 46
47 #if defined(OS_WIN) 47 #if defined(OS_WIN)
48 #define ICU_UTIL_DATA_IMPL ICU_UTIL_DATA_SHARED 48 #define ICU_UTIL_DATA_IMPL ICU_UTIL_DATA_SHARED
49 #elif defined(OS_MACOSX) 49 #elif defined(OS_MACOSX)
50 #define ICU_UTIL_DATA_IMPL ICU_UTIL_DATA_STATIC 50 #define ICU_UTIL_DATA_IMPL ICU_UTIL_DATA_STATIC
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 #endif 93 #endif
94 } 94 }
95 95
96 int main(int argc, char **argv) { 96 int main(int argc, char **argv) {
97 ::testing::InitGoogleTest(&argc, argv); 97 ::testing::InitGoogleTest(&argc, argv);
98 98
99 InitializeICU(); 99 InitializeICU();
100 100
101 return RUN_ALL_TESTS(); 101 return RUN_ALL_TESTS();
102 } 102 }
OLDNEW
« no previous file with comments | « url/DEPS ('k') | url/url_canon_icu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698