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

Unified Diff: chrome/test/chromedriver/chrome_finder.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
« no previous file with comments | « chrome/test/automation/tab_proxy.cc ('k') | chrome/test/chromedriver/key_converter_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/chromedriver/chrome_finder.cc
diff --git a/chrome/test/chromedriver/chrome_finder.cc b/chrome/test/chromedriver/chrome_finder.cc
index 4a6e420b62dfb936a9a6d33acc158b5f0dbf53cd..f08d3a73a9e8c64215eb4d54a544da2abcc3d661 100644
--- a/chrome/test/chromedriver/chrome_finder.cc
+++ b/chrome/test/chromedriver/chrome_finder.cc
@@ -29,7 +29,7 @@ void GetApplicationDirs(std::vector<base::FilePath>* locations) {
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");
@@ -42,9 +42,9 @@ void GetApplicationDirs(std::vector<base::FilePath>* locations) {
// Add the system-level location.
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)));
if (env->GetVar("ProgramFiles(x86)", &program_dir))
- locations->push_back(base::FilePath(UTF8ToWide(program_dir)));
+ locations->push_back(base::FilePath(base::UTF8ToWide(program_dir)));
}
#elif defined(OS_LINUX)
void GetApplicationDirs(std::vector<base::FilePath>* locations) {
« no previous file with comments | « chrome/test/automation/tab_proxy.cc ('k') | chrome/test/chromedriver/key_converter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698