diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-30 07:17:30 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-30 07:17:30 +0000 |
| commit | f72a1ccce08050ede3d1e46cbbcd9cf5b3a1c236 (patch) | |
| tree | e915476e6da96eb67e56e6ea63c8d05a4280cbee /chrome_frame | |
| parent | 7e868c9633b4d6f41c8d559625b69ef9fece5b8b (diff) | |
| download | chromium_src-f72a1ccce08050ede3d1e46cbbcd9cf5b3a1c236.zip chromium_src-f72a1ccce08050ede3d1e46cbbcd9cf5b3a1c236.tar.gz chromium_src-f72a1ccce08050ede3d1e46cbbcd9cf5b3a1c236.tar.bz2 | |
Remove deprecated things from net test suite:
- URLRequestTestContext (from now on use TestURLRequestContext)
- TestServerPageW (use TestServerPage).
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/1814002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46044 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/test/http_server.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome_frame/test/http_server.cc b/chrome_frame/test/http_server.cc index d8223f2..ae71c0b 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() { |