Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(676)

Unified Diff: base/file_util_posix.cc

Issue 119335: Linux: refactor zygote support (Closed)
Patch Set: ... Created 11 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/command_line.cc ('k') | base/global_descriptors_posix.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/file_util_posix.cc
diff --git a/base/file_util_posix.cc b/base/file_util_posix.cc
index 7f40c17756e6cc2067c62b2fbb4d9d790c93a03a..9d1decf9d623ee9cab816483b9ed53182a43d972 100644
--- a/base/file_util_posix.cc
+++ b/base/file_util_posix.cc
@@ -27,7 +27,6 @@
#include "base/logging.h"
#include "base/string_util.h"
#include "base/time.h"
-#include "base/zygote_manager.h"
namespace file_util {
@@ -626,19 +625,8 @@ MemoryMappedFile::MemoryMappedFile()
}
bool MemoryMappedFile::MapFileToMemory(const FilePath& file_name) {
- 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);
+ file_ = open(file_name.value().c_str(), O_RDONLY);
+
if (file_ == -1) {
LOG(ERROR) << "Couldn't open " << file_name.value();
return false;
« no previous file with comments | « base/command_line.cc ('k') | base/global_descriptors_posix.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698