Port some more parts of browser/...

chrome/browser/automation/url_request_mock_http_job.cc

Index: chrome/browser/automation/url_request_mock_http_job.cc
===================================================================
--- chrome/browser/automation/url_request_mock_http_job.cc	(revision 3500)
+++ chrome/browser/automation/url_request_mock_http_job.cc	(working copy)
@@ -2,8 +2,6 @@
 // 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"
@@ -34,7 +32,7 @@
 
   // 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;
@@ -52,10 +50,10 @@
 
 /* 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);
 }