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

Side by Side Diff: url/url_test_utils.h

Issue 111373008: Update some uses of char16 to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 12 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/ime/mock_input_method.cc ('k') | no next file » | 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 #ifndef URL_URL_TEST_UTILS_H_ 5 #ifndef URL_URL_TEST_UTILS_H_
6 #define URL_URL_TEST_UTILS_H_ 6 #define URL_URL_TEST_UTILS_H_
7 7
8 // Convenience functions for string conversions. 8 // Convenience functions for string conversions.
9 // These are mostly intended for use in unit tests. 9 // These are mostly intended for use in unit tests.
10 10
11 #include <string> 11 #include <string>
12 12
13 #include "base/strings/string16.h" 13 #include "base/strings/string16.h"
14 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
15 #include "url/url_canon_internal.h" 15 #include "url/url_canon_internal.h"
16 16
17 namespace url_test_utils { 17 namespace url_test_utils {
18 18
19 // Converts a UTF-16 string from native wchar_t format to char16, by 19 // Converts a UTF-16 string from native wchar_t format to char16, by
20 // truncating the high 32 bits. This is not meant to handle true UTF-32 20 // truncating the high 32 bits. This is not meant to handle true UTF-32
21 // encoded strings. 21 // encoded strings.
22 inline base::string16 WStringToUTF16(const wchar_t* src) { 22 inline base::string16 WStringToUTF16(const wchar_t* src) {
23 base::string16 str; 23 base::string16 str;
24 int length = static_cast<int>(wcslen(src)); 24 int length = static_cast<int>(wcslen(src));
25 for (int i = 0; i < length; ++i) { 25 for (int i = 0; i < length; ++i) {
26 str.push_back(static_cast<char16>(src[i])); 26 str.push_back(static_cast<base::char16>(src[i]));
27 } 27 }
28 return str; 28 return str;
29 } 29 }
30 30
31 // Converts a string from UTF-8 to UTF-16 31 // Converts a string from UTF-8 to UTF-16
32 inline base::string16 ConvertUTF8ToUTF16(const std::string& src) { 32 inline base::string16 ConvertUTF8ToUTF16(const std::string& src) {
33 int length = static_cast<int>(src.length()); 33 int length = static_cast<int>(src.length());
34 EXPECT_LT(length, 1024); 34 EXPECT_LT(length, 1024);
35 url_canon::RawCanonOutputW<1024> output; 35 url_canon::RawCanonOutputW<1024> output;
36 EXPECT_TRUE(url_canon::ConvertUTF8ToUTF16(src.data(), length, &output)); 36 EXPECT_TRUE(url_canon::ConvertUTF8ToUTF16(src.data(), length, &output));
37 return base::string16(output.data(), output.length()); 37 return base::string16(output.data(), output.length());
38 } 38 }
39 39
40 // Converts a string from UTF-16 to UTF-8 40 // Converts a string from UTF-16 to UTF-8
41 inline std::string ConvertUTF16ToUTF8(const base::string16& src) { 41 inline std::string ConvertUTF16ToUTF8(const base::string16& src) {
42 std::string str; 42 std::string str;
43 url_canon::StdStringCanonOutput output(&str); 43 url_canon::StdStringCanonOutput output(&str);
44 EXPECT_TRUE(url_canon::ConvertUTF16ToUTF8(src.data(), 44 EXPECT_TRUE(url_canon::ConvertUTF16ToUTF8(src.data(),
45 static_cast<int>(src.length()), 45 static_cast<int>(src.length()),
46 &output)); 46 &output));
47 output.Complete(); 47 output.Complete();
48 return str; 48 return str;
49 } 49 }
50 50
51 } // namespace url_test_utils 51 } // namespace url_test_utils
52 52
53 #endif // URL_URL_TEST_UTILS_H_ 53 #endif // URL_URL_TEST_UTILS_H_
OLDNEW
« no previous file with comments | « ui/views/ime/mock_input_method.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698