diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-02 05:12:33 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-02 05:12:33 +0000 |
| commit | a3ef4830d5b5fdc52e5d7d0cb33dae8844f0961e (patch) | |
| tree | bdd4dac76e6034ef6cf33450e203269a715ea0e6 /webkit/support/weburl_loader_mock_factory.cc | |
| parent | 8bc574c57115e9ffd0169f33131c0865997dcb35 (diff) | |
| download | chromium_src-a3ef4830d5b5fdc52e5d7d0cb33dae8844f0961e.zip chromium_src-a3ef4830d5b5fdc52e5d7d0cb33dae8844f0961e.tar.gz chromium_src-a3ef4830d5b5fdc52e5d7d0cb33dae8844f0961e.tar.bz2 | |
Add FilePath to base namespace.
This updates headers that forward-declare it and a few random places to use the namespace explicitly. There us a using declaration in file_path.h that makes the rest compile, which we can do in future passes.
Review URL: https://codereview.chromium.org/12163003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180245 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/support/weburl_loader_mock_factory.cc')
| -rw-r--r-- | webkit/support/weburl_loader_mock_factory.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/webkit/support/weburl_loader_mock_factory.cc b/webkit/support/weburl_loader_mock_factory.cc index 43b15e4..11da208 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)) |