summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/automation/proxy_launcher.cc2
-rw-r--r--chrome/test/base/testing_profile_manager.cc2
-rw-r--r--chrome/test/base/ui_test_utils.cc2
-rw-r--r--chrome/test/base/web_ui_browsertest.cc2
-rw-r--r--chrome/test/chromedriver/capabilities.cc6
-rw-r--r--chrome/test/chromedriver/chrome/zip_internal.cc2
-rw-r--r--chrome/test/chromedriver/chrome/zip_reader.cc4
-rw-r--r--chrome/test/chromedriver/key_converter.cc6
-rw-r--r--chrome/test/chromedriver/key_converter_unittest.cc13
-rw-r--r--chrome/test/chromedriver/keycode_text_conversion_mac.mm4
-rw-r--r--chrome/test/chromedriver/keycode_text_conversion_unittest.cc9
-rw-r--r--chrome/test/chromedriver/keycode_text_conversion_win.cc2
-rw-r--r--chrome/test/chromedriver/keycode_text_conversion_x.cc4
-rw-r--r--chrome/test/chromedriver/test_util.cc2
-rw-r--r--chrome/test/data/webui/history_ui_browsertest.cc2
-rw-r--r--chrome/test/perf/dom_checker_uitest.cc2
-rw-r--r--chrome/test/perf/frame_rate/frame_rate_tests.cc2
-rw-r--r--chrome/test/perf/generate_profile.cc4
-rw-r--r--chrome/test/perf/indexeddb_uitest.cc2
-rw-r--r--chrome/test/perf/startup_test.cc6
-rw-r--r--chrome/test/perf/tab_switching_test.cc3
21 files changed, 42 insertions, 39 deletions
diff --git a/chrome/test/automation/proxy_launcher.cc b/chrome/test/automation/proxy_launcher.cc
index e3565b0..92c29a8 100644
--- a/chrome/test/automation/proxy_launcher.cc
+++ b/chrome/test/automation/proxy_launcher.cc
@@ -482,7 +482,7 @@ bool ProxyLauncher::LaunchBrowserHelper(const LaunchState& state,
const char* browser_wrapper = getenv("BROWSER_WRAPPER");
if (browser_wrapper) {
#if defined(OS_WIN)
- command_line.PrependWrapper(ASCIIToWide(browser_wrapper));
+ command_line.PrependWrapper(base::ASCIIToWide(browser_wrapper));
#elif defined(OS_POSIX)
command_line.PrependWrapper(browser_wrapper);
#endif
diff --git a/chrome/test/base/testing_profile_manager.cc b/chrome/test/base/testing_profile_manager.cc
index d96c5eb..4bcb590 100644
--- a/chrome/test/base/testing_profile_manager.cc
+++ b/chrome/test/base/testing_profile_manager.cc
@@ -91,7 +91,7 @@ TestingProfile* TestingProfileManager::CreateTestingProfile(
const std::string& name) {
DCHECK(called_set_up_);
return CreateTestingProfile(name, scoped_ptr<PrefServiceSyncable>(),
- UTF8ToUTF16(name), 0, std::string(),
+ base::UTF8ToUTF16(name), 0, std::string(),
TestingProfile::TestingFactories());
}
diff --git a/chrome/test/base/ui_test_utils.cc b/chrome/test/base/ui_test_utils.cc
index 587ef70..c3e4847 100644
--- a/chrome/test/base/ui_test_utils.cc
+++ b/chrome/test/base/ui_test_utils.cc
@@ -393,7 +393,7 @@ void SendToOmniboxAndSubmit(LocationBar* location_bar,
const std::string& input) {
OmniboxView* omnibox = location_bar->GetOmniboxView();
omnibox->model()->OnSetFocus(false);
- omnibox->SetUserText(ASCIIToUTF16(input));
+ omnibox->SetUserText(base::ASCIIToUTF16(input));
location_bar->AcceptInput();
while (!omnibox->model()->autocomplete_controller()->done()) {
content::WindowedNotificationObserver observer(
diff --git a/chrome/test/base/web_ui_browsertest.cc b/chrome/test/base/web_ui_browsertest.cc
index dbcc2f6..81f54c6 100644
--- a/chrome/test/base/web_ui_browsertest.cc
+++ b/chrome/test/base/web_ui_browsertest.cc
@@ -487,7 +487,7 @@ void WebUIBrowserTest::BuildJavascriptLibraries(base::string16* content) {
utf8_content.append(library_content);
utf8_content.append(";\n");
}
- content->append(UTF8ToUTF16(utf8_content));
+ content->append(base::UTF8ToUTF16(utf8_content));
}
base::string16 WebUIBrowserTest::BuildRunTestJSCall(
diff --git a/chrome/test/chromedriver/capabilities.cc b/chrome/test/chromedriver/capabilities.cc
index adae250..3c561b6 100644
--- a/chrome/test/chromedriver/capabilities.cc
+++ b/chrome/test/chromedriver/capabilities.cc
@@ -309,7 +309,7 @@ void Switches::SetSwitch(const std::string& name) {
void Switches::SetSwitch(const std::string& name, const std::string& value) {
#if defined(OS_WIN)
- SetSwitch(name, UTF8ToUTF16(value));
+ SetSwitch(name, base::UTF8ToUTF16(value));
#else
switch_map_[name] = value;
#endif
@@ -319,7 +319,7 @@ void Switches::SetSwitch(const std::string& name, const base::string16& value) {
#if defined(OS_WIN)
switch_map_[name] = value;
#else
- SetSwitch(name, UTF16ToUTF8(value));
+ SetSwitch(name, base::UTF16ToUTF8(value));
#endif
}
@@ -361,7 +361,7 @@ bool Switches::HasSwitch(const std::string& name) const {
std::string Switches::GetSwitchValue(const std::string& name) const {
NativeString value = GetSwitchValueNative(name);
#if defined(OS_WIN)
- return UTF16ToUTF8(value);
+ return base::UTF16ToUTF8(value);
#else
return value;
#endif
diff --git a/chrome/test/chromedriver/chrome/zip_internal.cc b/chrome/test/chromedriver/chrome/zip_internal.cc
index 0042e90..b8f6349 100644
--- a/chrome/test/chromedriver/chrome/zip_internal.cc
+++ b/chrome/test/chromedriver/chrome/zip_internal.cc
@@ -54,7 +54,7 @@ void* ZipOpenFunc(void *opaque, const char* filename, int mode) {
creation_disposition = CREATE_ALWAYS;
}
- base::string16 filename16 = UTF8ToUTF16(filename);
+ base::string16 filename16 = base::UTF8ToUTF16(filename);
if ((filename != NULL) && (desired_access != 0)) {
file = CreateFile(filename16.c_str(), desired_access, share_mode,
NULL, creation_disposition, flags_and_attributes, NULL);
diff --git a/chrome/test/chromedriver/chrome/zip_reader.cc b/chrome/test/chromedriver/chrome/zip_reader.cc
index 71d11f5..52bf815 100644
--- a/chrome/test/chromedriver/chrome/zip_reader.cc
+++ b/chrome/test/chromedriver/chrome/zip_reader.cc
@@ -40,8 +40,8 @@ ZipReader::EntryInfo::EntryInfo(const std::string& file_name_in_zip,
// We also consider that the file name is unsafe, if it's invalid UTF-8.
base::string16 file_name_utf16;
- if (!UTF8ToUTF16(file_name_in_zip.data(), file_name_in_zip.size(),
- &file_name_utf16)) {
+ if (!base::UTF8ToUTF16(file_name_in_zip.data(), file_name_in_zip.size(),
+ &file_name_utf16)) {
is_unsafe_ = true;
}
diff --git a/chrome/test/chromedriver/key_converter.cc b/chrome/test/chromedriver/key_converter.cc
index 57f98a4..6e40702 100644
--- a/chrome/test/chromedriver/key_converter.cc
+++ b/chrome/test/chromedriver/key_converter.cc
@@ -141,7 +141,7 @@ bool KeyCodeFromShorthandKey(char16 key_utf16,
bool* client_should_skip) {
base::string16 key_str_utf16;
key_str_utf16.push_back(key_utf16);
- std::string key_str_utf8 = UTF16ToUTF8(key_str_utf16);
+ std::string key_str_utf8 = base::UTF16ToUTF8(key_str_utf16);
if (key_str_utf8.length() != 1)
return false;
bool should_skip = false;
@@ -303,8 +303,8 @@ Status ConvertKeysToKeyEvents(const base::string16& client_keys,
}
} else {
// Do a best effort and use the raw key we were given.
- unmodified_text = UTF16ToUTF8(keys.substr(i, 1));
- modified_text = UTF16ToUTF8(keys.substr(i, 1));
+ unmodified_text = base::UTF16ToUTF8(keys.substr(i, 1));
+ modified_text = base::UTF16ToUTF8(keys.substr(i, 1));
}
}
diff --git a/chrome/test/chromedriver/key_converter_unittest.cc b/chrome/test/chromedriver/key_converter_unittest.cc
index 3318ca8a..21a3c5f 100644
--- a/chrome/test/chromedriver/key_converter_unittest.cc
+++ b/chrome/test/chromedriver/key_converter_unittest.cc
@@ -50,7 +50,7 @@ void CheckEventsReleaseModifiers(const base::string16& keys,
void CheckEventsReleaseModifiers(const std::string& keys,
KeyEvent expected_events[],
size_t expected_size) {
- CheckEventsReleaseModifiers(UTF8ToUTF16(keys),
+ CheckEventsReleaseModifiers(base::UTF8ToUTF16(keys),
expected_events, expected_size);
}
@@ -59,7 +59,7 @@ void CheckNonShiftChar(ui::KeyboardCode key_code, char character) {
std::string char_string;
char_string.push_back(character);
std::list<KeyEvent> events;
- EXPECT_EQ(kOk, ConvertKeysToKeyEvents(ASCIIToUTF16(char_string),
+ EXPECT_EQ(kOk, ConvertKeysToKeyEvents(base::ASCIIToUTF16(char_string),
true /* release_modifiers*/,
&modifiers, &events).code());
ASSERT_EQ(3u, events.size()) << "Char: " << character;
@@ -79,7 +79,7 @@ void CheckShiftChar(ui::KeyboardCode key_code, char character, char lower) {
std::string char_string;
char_string.push_back(character);
std::list<KeyEvent> events;
- EXPECT_EQ(kOk, ConvertKeysToKeyEvents(ASCIIToUTF16(char_string),
+ EXPECT_EQ(kOk, ConvertKeysToKeyEvents(base::ASCIIToUTF16(char_string),
true /* release_modifiers*/,
&modifiers, &events).code());
ASSERT_EQ(5u, events.size()) << "Char: " << character;
@@ -152,9 +152,10 @@ TEST(KeyConverter, WebDriverSpecialNonCharKey) {
TEST(KeyConverter, FrenchKeyOnEnglishLayout) {
KeyEvent event_array[] = {
CreateKeyDownEvent(ui::VKEY_UNKNOWN, 0),
- CreateCharEvent(WideToUTF8(L"\u00E9"), WideToUTF8(L"\u00E9"), 0),
+ CreateCharEvent(base::WideToUTF8(L"\u00E9"),
+ base::WideToUTF8(L"\u00E9"), 0),
CreateKeyUpEvent(ui::VKEY_UNKNOWN, 0)};
- CheckEventsReleaseModifiers(WideToUTF16(L"\u00E9"),
+ CheckEventsReleaseModifiers(base::WideToUTF16(L"\u00E9"),
event_array, arraysize(event_array));
}
@@ -210,7 +211,7 @@ TEST(KeyConverter, UppercaseCharUsesShiftOnlyIfNecessary) {
CreateKeyUpEvent(ui::VKEY_SHIFT, 0)};
base::string16 keys;
keys.push_back(static_cast<char16>(0xE008U));
- keys.append(UTF8ToUTF16("aBc"));
+ keys.append(base::UTF8ToUTF16("aBc"));
CheckEventsReleaseModifiers(keys, event_array, arraysize(event_array));
}
diff --git a/chrome/test/chromedriver/keycode_text_conversion_mac.mm b/chrome/test/chromedriver/keycode_text_conversion_mac.mm
index a5abaa6..6d8a2c3 100644
--- a/chrome/test/chromedriver/keycode_text_conversion_mac.mm
+++ b/chrome/test/chromedriver/keycode_text_conversion_mac.mm
@@ -66,7 +66,7 @@ bool ConvertKeyCodeToText(
if (status == noErr && char_count == 1 && !std::iscntrl(character)) {
base::string16 text16;
text16.push_back(character);
- *text = UTF16ToUTF8(text16);
+ *text = base::UTF16ToUTF8(text16);
return true;
}
*text = std::string();
@@ -78,7 +78,7 @@ bool ConvertCharToKeyCode(
std::string* error_msg) {
base::string16 key_string;
key_string.push_back(key);
- std::string key_string_utf8 = UTF16ToUTF8(key_string);
+ std::string key_string_utf8 = base::UTF16ToUTF8(key_string);
bool found_code = false;
*error_msg = std::string();
// There doesn't seem to be a way to get a mac key code for a given unicode
diff --git a/chrome/test/chromedriver/keycode_text_conversion_unittest.cc b/chrome/test/chromedriver/keycode_text_conversion_unittest.cc
index b5750b7..5c95fa0 100644
--- a/chrome/test/chromedriver/keycode_text_conversion_unittest.cc
+++ b/chrome/test/chromedriver/keycode_text_conversion_unittest.cc
@@ -27,14 +27,14 @@ void CheckCharToKeyCode16(char16 character, ui::KeyboardCode key_code,
void CheckCharToKeyCode(char character, ui::KeyboardCode key_code,
int modifiers) {
- CheckCharToKeyCode16(UTF8ToUTF16(std::string(1, character))[0],
+ CheckCharToKeyCode16(base::UTF8ToUTF16(std::string(1, character))[0],
key_code, modifiers);
}
#if defined(OS_WIN)
void CheckCharToKeyCode(wchar_t character, ui::KeyboardCode key_code,
int modifiers) {
- CheckCharToKeyCode16(WideToUTF16(std::wstring(1, character))[0],
+ CheckCharToKeyCode16(base::WideToUTF16(std::wstring(1, character))[0],
key_code, modifiers);
}
#endif
@@ -42,7 +42,7 @@ void CheckCharToKeyCode(wchar_t character, ui::KeyboardCode key_code,
void CheckCantConvertChar(wchar_t character) {
std::wstring character_string;
character_string.push_back(character);
- char16 character_utf16 = WideToUTF16(character_string)[0];
+ char16 character_utf16 = base::WideToUTF16(character_string)[0];
ui::KeyboardCode actual_key_code = ui::VKEY_UNKNOWN;
int actual_modifiers = 0;
std::string error_msg;
@@ -156,7 +156,8 @@ TEST(KeycodeTextConversionTest, MAYBE_NonEnglish) {
// Regression test for chromedriver bug #405.
ASSERT_TRUE(SwitchKeyboardLayout("00000419")); // russian
CheckCharToKeyCode(L'\u0438', ui::VKEY_B, 0);
- EXPECT_EQ(UTF16ToUTF8(L"\u0438"), ConvertKeyCodeToTextNoError(ui::VKEY_B, 0));
+ EXPECT_EQ(base::UTF16ToUTF8(L"\u0438"),
+ ConvertKeyCodeToTextNoError(ui::VKEY_B, 0));
#elif defined(OS_MACOSX)
ASSERT_TRUE(SwitchKeyboardLayout("com.apple.keylayout.German"));
CheckCharToKeyCode('z', ui::VKEY_Y, 0);
diff --git a/chrome/test/chromedriver/keycode_text_conversion_win.cc b/chrome/test/chromedriver/keycode_text_conversion_win.cc
index 9a65778..d65919d 100644
--- a/chrome/test/chromedriver/keycode_text_conversion_win.cc
+++ b/chrome/test/chromedriver/keycode_text_conversion_win.cc
@@ -30,7 +30,7 @@ bool ConvertKeyCodeToText(
if (code <= 0 || (code == 1 && iswcntrl(chars[0])))
*text = std::string();
else
- WideToUTF8(chars, code, text);
+ base::WideToUTF8(chars, code, text);
return true;
}
diff --git a/chrome/test/chromedriver/keycode_text_conversion_x.cc b/chrome/test/chromedriver/keycode_text_conversion_x.cc
index fbb5888..0499203 100644
--- a/chrome/test/chromedriver/keycode_text_conversion_x.cc
+++ b/chrome/test/chromedriver/keycode_text_conversion_x.cc
@@ -224,7 +224,7 @@ bool ConvertKeyCodeToText(
if (!character)
*text = std::string();
else
- *text = UTF16ToUTF8(base::string16(1, character));
+ *text = base::UTF16ToUTF8(base::string16(1, character));
return true;
}
@@ -233,7 +233,7 @@ bool ConvertCharToKeyCode(
ui::KeyboardCode* key_code,
int* necessary_modifiers,
std::string* error_msg) {
- std::string key_string(UTF16ToUTF8(base::string16(1, key)));
+ std::string key_string(base::UTF16ToUTF8(base::string16(1, key)));
bool found = false;
ui::KeyboardCode test_code;
int test_modifiers;
diff --git a/chrome/test/chromedriver/test_util.cc b/chrome/test/chromedriver/test_util.cc
index 14f1c74..bfa7de4 100644
--- a/chrome/test/chromedriver/test_util.cc
+++ b/chrome/test/chromedriver/test_util.cc
@@ -30,7 +30,7 @@ RestoreKeyboardLayoutOnDestruct::~RestoreKeyboardLayoutOnDestruct() {
#if defined(OS_WIN)
bool SwitchKeyboardLayout(const std::string& input_locale_identifier) {
HKL layout = LoadKeyboardLayout(
- UTF8ToWide(input_locale_identifier).c_str(), 0);
+ base::UTF8ToWide(input_locale_identifier).c_str(), 0);
if (!layout)
return false;
return !!ActivateKeyboardLayout(layout, 0);
diff --git a/chrome/test/data/webui/history_ui_browsertest.cc b/chrome/test/data/webui/history_ui_browsertest.cc
index e60befc..69af912 100644
--- a/chrome/test/data/webui/history_ui_browsertest.cc
+++ b/chrome/test/data/webui/history_ui_browsertest.cc
@@ -40,7 +40,7 @@ void HistoryUIBrowserTest::AddPageToHistory(
history_->AddPage(gurl, time, id_scope, page_id_++, GURL(),
history::RedirectList(), content::PAGE_TRANSITION_LINK,
history::SOURCE_BROWSED, false);
- history_->SetPageTitle(gurl, UTF8ToUTF16(title));
+ history_->SetPageTitle(gurl, base::UTF8ToUTF16(title));
}
void HistoryUIBrowserTest::SetDeleteAllowed(bool allowed) {
diff --git a/chrome/test/perf/dom_checker_uitest.cc b/chrome/test/perf/dom_checker_uitest.cc
index dcd5e32..ab468b6 100644
--- a/chrome/test/perf/dom_checker_uitest.cc
+++ b/chrome/test/perf/dom_checker_uitest.cc
@@ -176,7 +176,7 @@ class DomCheckerTest : public UITest {
if (!succeeded)
return false;
- std::string json = WideToUTF8(json_wide);
+ std::string json = base::WideToUTF8(json_wide);
JSONStringValueSerializer deserializer(json);
scoped_ptr<base::Value> value(deserializer.Deserialize(NULL, NULL));
diff --git a/chrome/test/perf/frame_rate/frame_rate_tests.cc b/chrome/test/perf/frame_rate/frame_rate_tests.cc
index 705aaee..b1d36e4 100644
--- a/chrome/test/perf/frame_rate/frame_rate_tests.cc
+++ b/chrome/test/perf/frame_rate/frame_rate_tests.cc
@@ -236,7 +236,7 @@ class FrameRateTest
&json));
std::map<std::string, std::string> results;
- ASSERT_TRUE(JsonDictionaryToMap(WideToUTF8(json), &results));
+ ASSERT_TRUE(JsonDictionaryToMap(base::WideToUTF8(json), &results));
ASSERT_TRUE(results.find("mean") != results.end());
ASSERT_TRUE(results.find("sigma") != results.end());
diff --git a/chrome/test/perf/generate_profile.cc b/chrome/test/perf/generate_profile.cc
index 44c72ad..c749dfd 100644
--- a/chrome/test/perf/generate_profile.cc
+++ b/chrome/test/perf/generate_profile.cc
@@ -90,8 +90,8 @@ base::string16 RandomWords(int count) {
// Return a random URL-looking string.
GURL ConstructRandomURL() {
- return GURL(ASCIIToUTF16("http://") + RandomChars(3) + ASCIIToUTF16(".com/") +
- RandomChars(RandomInt(5, 20)));
+ return GURL(base::ASCIIToUTF16("http://") + RandomChars(3) +
+ base::ASCIIToUTF16(".com/") + RandomChars(RandomInt(5, 20)));
}
// Return a random page title-looking string.
diff --git a/chrome/test/perf/indexeddb_uitest.cc b/chrome/test/perf/indexeddb_uitest.cc
index ec1a42b..f6e4066 100644
--- a/chrome/test/perf/indexeddb_uitest.cc
+++ b/chrome/test/perf/indexeddb_uitest.cc
@@ -74,7 +74,7 @@ class IndexedDBTest : public UIPerfTest {
if (!succeeded)
return false;
- std::string json = WideToUTF8(json_wide);
+ std::string json = base::WideToUTF8(json_wide);
return JsonDictionaryToMap(json, results);
}
diff --git a/chrome/test/perf/startup_test.cc b/chrome/test/perf/startup_test.cc
index 679d180..e15048e 100644
--- a/chrome/test/perf/startup_test.cc
+++ b/chrome/test/perf/startup_test.cc
@@ -119,11 +119,11 @@ class StartupTest : public UIPerfTest {
// Read in preferences template.
std::string pref_string;
EXPECT_TRUE(base::ReadFileToString(pref_template_path, &pref_string));
- base::string16 format_string = ASCIIToUTF16(pref_string);
+ base::string16 format_string = base::ASCIIToUTF16(pref_string);
// Make sure temp directory has the proper format for writing to prefs file.
#if defined(OS_POSIX)
- std::wstring user_data_dir_w(ASCIIToWide(user_data_dir().value()));
+ std::wstring user_data_dir_w(base::ASCIIToWide(user_data_dir().value()));
#elif defined(OS_WIN)
std::wstring user_data_dir_w(user_data_dir().value());
// In Windows, the FilePath will write '\' for the path separators; change
@@ -134,7 +134,7 @@ class StartupTest : public UIPerfTest {
// Rewrite prefs file.
std::vector<base::string16> subst;
- subst.push_back(WideToUTF16(user_data_dir_w));
+ subst.push_back(base::WideToUTF16(user_data_dir_w));
const std::string prefs_string =
UTF16ToASCII(ReplaceStringPlaceholders(format_string, subst, NULL));
EXPECT_TRUE(file_util::WriteFile(pref_path, prefs_string.c_str(),
diff --git a/chrome/test/perf/tab_switching_test.cc b/chrome/test/perf/tab_switching_test.cc
index abd2786..16e587a 100644
--- a/chrome/test/perf/tab_switching_test.cc
+++ b/chrome/test/perf/tab_switching_test.cc
@@ -51,7 +51,8 @@ class TabSwitchingUITest : public UIPerfTest {
// Set the log file path for the browser test.
scoped_ptr<base::Environment> env(base::Environment::Create());
#if defined(OS_WIN)
- env->SetVar(env_vars::kLogFileName, WideToUTF8(log_file_name_.value()));
+ env->SetVar(env_vars::kLogFileName,
+ base::WideToUTF8(log_file_name_.value()));
#else
env->SetVar(env_vars::kLogFileName, log_file_name_.value());
#endif
generated by cgit v1.1 at 2024-07-11 22:00:09 +0000