Remove deprecated things from net test suite:

chrome_frame/test/http_server.cc

 // 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() {
   std::wstring document_root(kDocRoot);
   server_ = HTTPTestServer::CreateServer(document_root, NULL, 30, 1000);
   ASSERT_TRUE(server_ != NULL);
 
   // copy CFInstance.js into the test directory
   FilePath cf_source_path;
   PathService::Get(base::DIR_SOURCE_ROOT, &cf_source_path);
@@ skipping 39 matching lines @@
   file_util::Delete(cfi_path, false);
 }
 
 bool ChromeFrameHTTPServer::WaitToFinish(int milliseconds) {
   if (!server_)
     return true;
 
   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() {
   return server_->GetDataDirectory().ToWStringHack();
 }