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

Unified Diff: chrome/test/webdriver/webdriver_automation.cc

Issue 12314090: Add utf_string_conversions to base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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
Index: chrome/test/webdriver/webdriver_automation.cc
diff --git a/chrome/test/webdriver/webdriver_automation.cc b/chrome/test/webdriver/webdriver_automation.cc
index f604d7819c9d4195892162f6a144fe53ee6ae9a9..083bf182c4ba68878d6f9fe8aa151333aaab9106 100644
--- a/chrome/test/webdriver/webdriver_automation.cc
+++ b/chrome/test/webdriver/webdriver_automation.cc
@@ -129,7 +129,7 @@ bool GetDefaultChromeExe(base::FilePath* browser_exe) {
scoped_ptr<base::Environment> env(base::Environment::Create());
std::string home_dir;
if (env->GetVar("userprofile", &home_dir)) {
- base::FilePath default_location(UTF8ToWide(home_dir));
+ base::FilePath default_location(base::UTF8ToWide(home_dir));
if (base::win::GetVersion() < base::win::VERSION_VISTA) {
default_location = default_location.Append(
L"Local Settings\\Application Data");
@@ -143,15 +143,15 @@ bool GetDefaultChromeExe(base::FilePath* browser_exe) {
// Add the system-level location for Chrome.
std::string program_dir;
if (env->GetVar("ProgramFiles", &program_dir)) {
- locations.push_back(base::FilePath(UTF8ToWide(program_dir))
+ locations.push_back(base::FilePath(base::UTF8ToWide(program_dir))
.Append(app_from_google));
- chromium_locations.push_back(base::FilePath(UTF8ToWide(program_dir))
+ chromium_locations.push_back(base::FilePath(base::UTF8ToWide(program_dir))
.Append(app_from_chromium));
}
if (env->GetVar("ProgramFiles(x86)", &program_dir)) {
- locations.push_back(base::FilePath(UTF8ToWide(program_dir))
+ locations.push_back(base::FilePath(base::UTF8ToWide(program_dir))
.Append(app_from_google));
- chromium_locations.push_back(base::FilePath(UTF8ToWide(program_dir))
+ chromium_locations.push_back(base::FilePath(base::UTF8ToWide(program_dir))
.Append(app_from_chromium));
}
#elif defined(OS_MACOSX)
@@ -450,7 +450,7 @@ void Automation::Init(
if (channel_id.empty()) {
std::string command_line_str;
#if defined(OS_WIN)
- command_line_str = WideToUTF8(command.GetCommandLineString());
+ command_line_str = base::WideToUTF8(command.GetCommandLineString());
#elif defined(OS_POSIX)
command_line_str = command.GetCommandLineString();
#endif
« no previous file with comments | « chrome/test/webdriver/keycode_text_conversion_win.cc ('k') | chrome/test/webdriver/webdriver_key_converter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698