Port some more parts of browser/...

chrome/browser/automation/url_request_mock_http_job.cc

 // Copyright (c) 2006-2008 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 <windows.h>
-
 #include "chrome/browser/automation/url_request_mock_http_job.h"
 
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "net/base/net_util.h"
 #include "net/url_request/url_request_filter.h"
 
 static const char kMockHostname[] = "mock.http";
 static const wchar_t kMockHeaderFileSuffix[] = L".mock-http-headers";
@@ skipping 10 matching lines @@
   std::string host_prefix("http://");
   host_prefix.append(kMockHostname);
   size_t host_prefix_len = host_prefix.length();
   if (url.compare(0, host_prefix_len, host_prefix.data(),
                   host_prefix_len) == 0) {
     file_url += UTF8ToWide(url.substr(host_prefix_len));
   }
 
   // Convert the file:/// URL to a path on disk.
   std::wstring file_path;
-  net::FileURLToFilePath(GURL(file_url), &file_path);
+  net::FileURLToFilePath(GURL(WideToUTF8(file_url)), &file_path);
   URLRequestMockHTTPJob* job = new URLRequestMockHTTPJob(request);
   job->file_path_ = file_path;
   return job;
 }
 
 /* static */
 void URLRequestMockHTTPJob::AddUITestUrls(const std::wstring& base_path) {
   base_path_ = base_path;
 
   // Add kMockHostname to URLRequestFilter.
   URLRequestFilter* filter = URLRequestFilter::GetInstance();
   filter->AddHostnameHandler("http", kMockHostname,
                              URLRequestMockHTTPJob::Factory);
 }
 
 /* static */
 GURL URLRequestMockHTTPJob::GetMockUrl(const std::wstring& path) {
-  std::wstring url = L"http://";
-  url.append(UTF8ToWide(kMockHostname));
-  url.append(L"/");
-  url.append(path);
+  std::string url = "http://";
+  url.append(kMockHostname);
+  url.append("/");
+  url.append(WideToUTF8(path));
   return GURL(url);
 }
 
 URLRequestMockHTTPJob::URLRequestMockHTTPJob(URLRequest* request)
     : URLRequestFileJob(request) { }
 
 void URLRequestMockHTTPJob::GetResponseInfo(net::HttpResponseInfo* info) {
   std::wstring header_file = file_path_ + kMockHeaderFileSuffix;
   std::string raw_headers;
   if (!file_util::ReadFileToString(header_file, &raw_headers))
     return;
 
   // ParseRawHeaders expects \0 to end each header line.
   ReplaceSubstringsAfterOffset(&raw_headers, 0, "\n", std::string("\0", 1));
   info->headers = new net::HttpResponseHeaders(raw_headers);
 }
 
 bool URLRequestMockHTTPJob::GetMimeType(std::string* mime_type) {
   net::HttpResponseInfo info;
   GetResponseInfo(&info);
   return info.headers && info.headers->GetMimeType(mime_type);
 }
 
 bool URLRequestMockHTTPJob::GetCharset(std::string* charset) {
   net::HttpResponseInfo info;
   GetResponseInfo(&info);
   return info.headers && info.headers->GetCharset(charset);
 }