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

Unified Diff: chrome_frame/test/test_server.cc

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/test/test_scrubber.cc ('k') | chrome_frame/test/test_with_web_server.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/test/test_server.cc
diff --git a/chrome_frame/test/test_server.cc b/chrome_frame/test/test_server.cc
index 3e918796f416a146cd87a47b9ac4cb934ca6e621..327ed2f837f1c9578f30948d29fdb3407f6322c8 100644
--- a/chrome_frame/test/test_server.cc
+++ b/chrome_frame/test/test_server.cc
@@ -258,8 +258,8 @@ HTTPTestServer::HTTPTestServer(int port, const std::wstring& address,
base::FilePath root_dir)
: port_(port), address_(address), root_dir_(root_dir) {
net::EnsureWinsockInit();
- server_ =
- net::TCPListenSocket::CreateAndListen(WideToUTF8(address), port, this);
+ server_ = net::TCPListenSocket::CreateAndListen(
+ base::WideToUTF8(address), port, this);
}
HTTPTestServer::~HTTPTestServer() {
@@ -309,7 +309,7 @@ void HTTPTestServer::DidRead(net::StreamListenSocket* socket,
if (connection->r_.AllContentReceived()) {
VLOG(1) << __FUNCTION__ << ": " << connection->r_.method() << " "
<< connection->r_.path();
- std::wstring path = UTF8ToWide(connection->r_.path());
+ std::wstring path = base::UTF8ToWide(connection->r_.path());
if (LowerCaseEqualsASCII(connection->r_.method(), "post"))
this->Post(connection, path, connection->r_);
else
« no previous file with comments | « chrome_frame/test/test_scrubber.cc ('k') | chrome_frame/test/test_with_web_server.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698