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

Side by Side Diff: url/gurl_test_main.cc

Issue 18252003: Replace third_party/icu/public with third_party/icu/source (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: roll ICU to 211851 Created 7 years, 5 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 | « ui/views/controls/textfield/native_textfield_views.cc ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "build/build_config.h" 5 #include "build/build_config.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <windows.h> 8 #include <windows.h>
9 #endif 9 #endif
10 10
11 #include <string> 11 #include <string>
12 12
13 #include "testing/gtest/include/gtest/gtest.h" 13 #include "testing/gtest/include/gtest/gtest.h"
14 #include "third_party/icu/public/common/unicode/putil.h" 14 #include "third_party/icu/source/common/unicode/putil.h"
15 #include "third_party/icu/public/common/unicode/udata.h" 15 #include "third_party/icu/source/common/unicode/udata.h"
16 16
17 #define ICU_UTIL_DATA_SHARED 1 17 #define ICU_UTIL_DATA_SHARED 1
18 #define ICU_UTIL_DATA_STATIC 2 18 #define ICU_UTIL_DATA_STATIC 2
19 19
20 #ifndef ICU_UTIL_DATA_IMPL 20 #ifndef ICU_UTIL_DATA_IMPL
21 21
22 #if defined(OS_WIN) 22 #if defined(OS_WIN)
23 #define ICU_UTIL_DATA_IMPL ICU_UTIL_DATA_SHARED 23 #define ICU_UTIL_DATA_IMPL ICU_UTIL_DATA_SHARED
24 #elif defined(OS_MACOSX) 24 #elif defined(OS_MACOSX)
25 #define ICU_UTIL_DATA_IMPL ICU_UTIL_DATA_STATIC 25 #define ICU_UTIL_DATA_IMPL ICU_UTIL_DATA_STATIC
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 #endif 68 #endif
69 } 69 }
70 70
71 int main(int argc, char **argv) { 71 int main(int argc, char **argv) {
72 ::testing::InitGoogleTest(&argc, argv); 72 ::testing::InitGoogleTest(&argc, argv);
73 73
74 InitializeICU(); 74 InitializeICU();
75 75
76 return RUN_ALL_TESTS(); 76 return RUN_ALL_TESTS();
77 } 77 }
OLDNEW
« no previous file with comments | « ui/views/controls/textfield/native_textfield_views.cc ('k') | url/url_canon_icu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698