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 |