diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-10 23:28:46 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-10 23:28:46 +0000 |
| commit | ac577490a5c20950f63d655de37058dc41486e99 (patch) | |
| tree | e5a53f6cad3317c2451f8ef39bf0b19bd8706e79 /base/file_util_posix.cc | |
| parent | 0f1169993f28f8da9be5a81496fb2e2abf311387 (diff) | |
| download | chromium_src-ac577490a5c20950f63d655de37058dc41486e99.zip chromium_src-ac577490a5c20950f63d655de37058dc41486e99.tar.gz chromium_src-ac577490a5c20950f63d655de37058dc41486e99.tar.bz2 | |
Revert 18109, 18111: Windows UI tests failed.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18112 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/file_util_posix.cc')
| -rw-r--r-- | base/file_util_posix.cc | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/base/file_util_posix.cc b/base/file_util_posix.cc index aca0ff9..92b9d00 100644 --- a/base/file_util_posix.cc +++ b/base/file_util_posix.cc @@ -27,6 +27,7 @@ #include "base/logging.h" #include "base/string_util.h" #include "base/time.h" +#include "base/zygote_manager.h" namespace file_util { @@ -645,8 +646,19 @@ MemoryMappedFile::MemoryMappedFile() } bool MemoryMappedFile::MapFileToMemory(const FilePath& file_name) { - file_ = open(file_name.value().c_str(), O_RDONLY); - + file_ = -1; +#if defined(OS_LINUX) + base::ZygoteManager* zm = base::ZygoteManager::Get(); + if (zm) { + file_ = zm->OpenFile(file_name.value().c_str()); + if (file_ == -1) { + LOG(INFO) << "Zygote manager can't open " << file_name.value() + << ", retrying locally. (OK at start of ui_tests.)"; + } + } +#endif // defined(OS_LINUX) + if (file_ == -1) + file_ = open(file_name.value().c_str(), O_RDONLY); if (file_ == -1) { LOG(ERROR) << "Couldn't open " << file_name.value(); return false; |