| Index: chrome_frame/test/http_server.cc
|
| diff --git a/chrome_frame/test/http_server.cc b/chrome_frame/test/http_server.cc
|
| index d8223f2857840b2e70c8c61be7cd7e36d6df2699..ae71c0b9114d75a27f5a5c2df4b54008d999fd7c 100644
|
| --- a/chrome_frame/test/http_server.cc
|
| +++ b/chrome_frame/test/http_server.cc
|
| @@ -1,8 +1,11 @@
|
| // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
| +
|
| #include "chrome_frame/test/http_server.h"
|
|
|
| +#include "base/string_util.h"
|
| +
|
| const wchar_t kDocRoot[] = L"chrome_frame\\test\\data";
|
|
|
| void ChromeFrameHTTPServer::SetUp() {
|
| @@ -62,8 +65,9 @@ bool ChromeFrameHTTPServer::WaitToFinish(int milliseconds) {
|
| return server_->WaitToFinish(milliseconds);
|
| }
|
|
|
| +// TODO(phajdan.jr): Change wchar_t* to std::string& and fix callers.
|
| GURL ChromeFrameHTTPServer::Resolve(const wchar_t* relative_url) {
|
| - return server_->TestServerPageW(relative_url);
|
| + return server_->TestServerPage(WideToUTF8(relative_url));
|
| }
|
|
|
| std::wstring ChromeFrameHTTPServer::GetDataDir() {
|
|
|