diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-15 20:18:09 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-15 20:18:09 +0000 |
| commit | dcd16611096dcc5e7651763ff888135e0fb305fc (patch) | |
| tree | fe1f69c236a92bd701bad04a6ccc1d30c08c6217 /chrome_frame | |
| parent | 6dd1c54f48283e9c61b097b59feecf8d221e123b (diff) | |
| download | chromium_src-dcd16611096dcc5e7651763ff888135e0fb305fc.zip chromium_src-dcd16611096dcc5e7651763ff888135e0fb305fc.tar.gz chromium_src-dcd16611096dcc5e7651763ff888135e0fb305fc.tar.bz2 | |
Move PathIsWritable, DirectoryExists, ContentsEqual, and TextContentsEqual to the base namespace.
TBR=sky
Review URL: https://codereview.chromium.org/19052005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211675 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/simple_resource_loader.cc | 4 | ||||
| -rw-r--r-- | chrome_frame/test/test_with_web_server.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome_frame/simple_resource_loader.cc b/chrome_frame/simple_resource_loader.cc index 3d4426a..e6d5c6c 100644 --- a/chrome_frame/simple_resource_loader.cc +++ b/chrome_frame/simple_resource_loader.cc @@ -148,7 +148,7 @@ void SimpleResourceLoader::DetermineLocalesDirectory( // We may be residing in the "locales" directory's parent, or we might be // in a sibling directory. Move up one and look for Locales again in the // latter case. - if (!file_util::DirectoryExists(*locales_path)) { + if (!base::DirectoryExists(*locales_path)) { *locales_path = module_path.DirName(); *locales_path = locales_path->Append(kLocalesDirName); } @@ -225,7 +225,7 @@ bool SimpleResourceLoader::LoadLocalePack( } } } - DCHECK(found_pack || file_util::DirectoryExists(locales_path)) + DCHECK(found_pack || base::DirectoryExists(locales_path)) << "Could not locate locales DLL directory."; return found_pack; } diff --git a/chrome_frame/test/test_with_web_server.cc b/chrome_frame/test/test_with_web_server.cc index 9c93a377..06869ad 100644 --- a/chrome_frame/test/test_with_web_server.cc +++ b/chrome_frame/test/test_with_web_server.cc @@ -400,7 +400,7 @@ void MockWebServer::SendResponseHelper( std::string headers, body; std::string content_type; if (base::PathExists(file_path) && - !file_util::DirectoryExists(file_path)) { + !base::DirectoryExists(file_path)) { base::FilePath mock_http_headers(file_path.value() + L".mock-http-headers"); if (base::PathExists(mock_http_headers)) { headers = GetMockHttpHeaders(mock_http_headers); |