| Index: webkit/support/weburl_loader_mock_factory.cc
|
| diff --git a/webkit/support/weburl_loader_mock_factory.cc b/webkit/support/weburl_loader_mock_factory.cc
|
| index 43b15e4574d9f7fed0c58f90be7c8c813c6d187d..11da208e0d19f09dca28ab6f1f707f85621cc506 100644
|
| --- a/webkit/support/weburl_loader_mock_factory.cc
|
| +++ b/webkit/support/weburl_loader_mock_factory.cc
|
| @@ -25,7 +25,7 @@ using WebKit::WebURLResponse;
|
|
|
| struct WebURLLoaderMockFactory::ResponseInfo {
|
| WebKit::WebURLResponse response;
|
| - FilePath file_path;
|
| + base::FilePath file_path;
|
| };
|
|
|
| WebURLLoaderMockFactory::WebURLLoaderMockFactory() {}
|
| @@ -41,10 +41,10 @@ void WebURLLoaderMockFactory::RegisterURL(const WebURL& url,
|
| #if defined(OS_POSIX)
|
| // TODO(jcivelli): On Linux, UTF8 might not be correct.
|
| response_info.file_path =
|
| - FilePath(static_cast<std::string>(file_path.utf8()));
|
| + base::FilePath(static_cast<std::string>(file_path.utf8()));
|
| #elif defined(OS_WIN)
|
| response_info.file_path =
|
| - FilePath(std::wstring(file_path.data(), file_path.length()));
|
| + base::FilePath(std::wstring(file_path.data(), file_path.length()));
|
| #endif
|
| DCHECK(file_util::PathExists(response_info.file_path))
|
| << response_info.file_path.MaybeAsASCII() << " does not exist.";
|
| @@ -176,7 +176,7 @@ bool WebURLLoaderMockFactory::IsPending(WebURLLoaderMock* loader) {
|
| }
|
|
|
| // static
|
| -bool WebURLLoaderMockFactory::ReadFile(const FilePath& file_path,
|
| +bool WebURLLoaderMockFactory::ReadFile(const base::FilePath& file_path,
|
| WebData* data) {
|
| int64 file_size = 0;
|
| if (!file_util::GetFileSize(file_path, &file_size))
|
|
|