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

Unified Diff: chrome_frame/test/chrome_frame_automation_mock.h

Issue 112433004: Update uses of UTF conversions in chrome_frame/, chromeos/, components/ to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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_frame/simple_resource_loader.cc ('k') | chrome_frame/test/chrome_frame_test_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/test/chrome_frame_automation_mock.h
diff --git a/chrome_frame/test/chrome_frame_automation_mock.h b/chrome_frame/test/chrome_frame_automation_mock.h
index 0b383e478d5936b1425075d65e5734642f524ed6..568a13af9cd67e48434d216a814d396d685fb1bc 100644
--- a/chrome_frame/test/chrome_frame_automation_mock.h
+++ b/chrome_frame/test/chrome_frame_automation_mock.h
@@ -36,8 +36,8 @@ class AutomationMockDelegate
// Endeavour to only kill off Chrome Frame derived Chrome processes.
base::KillAllNamedProcessesWithArgument(
- UTF8ToWide(chrome_frame_test::kChromeImageName),
- UTF8ToWide(switches::kChromeFrame));
+ base::UTF8ToWide(chrome_frame_test::kChromeImageName),
+ base::UTF8ToWide(switches::kChromeFrame));
mock_server_.ExpectAndServeAnyRequests(CFInvocation(CFInvocation::NONE));
@@ -83,11 +83,12 @@ class AutomationMockDelegate
FILE_PATH_LITERAL("chrome_frame")).Append(
FILE_PATH_LITERAL("test")).Append(
FILE_PATH_LITERAL("data")).Append(file).value());
- return Navigate(WideToUTF8(file_url));
+ return Navigate(base::WideToUTF8(file_url));
}
bool NavigateRelative(const std::wstring& relative_url) {
- return Navigate(WideToUTF8(mock_server_.Resolve(relative_url.c_str())));
+ return Navigate(base::WideToUTF8(
+ mock_server_.Resolve(relative_url.c_str())));
}
virtual void OnAutomationServerReady() {
« no previous file with comments | « chrome_frame/simple_resource_loader.cc ('k') | chrome_frame/test/chrome_frame_test_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698