| Index: chrome/browser/dom_ui/chrome_url_data_manager.cc
|
| diff --git a/chrome/browser/dom_ui/chrome_url_data_manager.cc b/chrome/browser/dom_ui/chrome_url_data_manager.cc
|
| index 623ad8d43ab6aae173046c182e63ef498e20c898..940ed683d976f450ee81b39c896a3e54d1ca4067 100644
|
| --- a/chrome/browser/dom_ui/chrome_url_data_manager.cc
|
| +++ b/chrome/browser/dom_ui/chrome_url_data_manager.cc
|
| @@ -83,7 +83,7 @@ class URLRequestChromeJob : public URLRequestJob {
|
| // URLRequestChromeFileJob is a URLRequestJob that acts like a file:// URL
|
| class URLRequestChromeFileJob : public URLRequestFileJob {
|
| public:
|
| - URLRequestChromeFileJob(URLRequest* request, const std::wstring& path);
|
| + URLRequestChromeFileJob(URLRequest* request, const FilePath& path);
|
| virtual ~URLRequestChromeFileJob();
|
|
|
| private:
|
| @@ -244,7 +244,8 @@ URLRequestJob* ChromeURLDataManager::Factory(URLRequest* request,
|
| // Try first with a file handler
|
| std::wstring path;
|
| if (ChromeURLDataManager::URLToFilePath(request->url(), &path))
|
| - return new URLRequestChromeFileJob(request, path);
|
| + return new URLRequestChromeFileJob(request,
|
| + FilePath::FromWStringHack(path));
|
|
|
| // Fall back to using a custom handler
|
| return new URLRequestChromeJob(request);
|
| @@ -329,10 +330,8 @@ void URLRequestChromeJob::StartAsync() {
|
| }
|
|
|
| URLRequestChromeFileJob::URLRequestChromeFileJob(URLRequest* request,
|
| - const std::wstring& path)
|
| - : URLRequestFileJob(request) {
|
| - // set URLRequestFileJob::file_path_
|
| - this->file_path_ = FilePath::FromWStringHack(path);
|
| + const FilePath& path)
|
| + : URLRequestFileJob(request, path) {
|
| }
|
|
|
| URLRequestChromeFileJob::~URLRequestChromeFileJob() { }
|
|
|