diff options
Diffstat (limited to 'chrome/test/chromedriver/chrome_launcher.cc')
| -rw-r--r-- | chrome/test/chromedriver/chrome_launcher.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/test/chromedriver/chrome_launcher.cc b/chrome/test/chromedriver/chrome_launcher.cc index 1ca47c3..44a4ad8 100644 --- a/chrome/test/chromedriver/chrome_launcher.cc +++ b/chrome/test/chromedriver/chrome_launcher.cc @@ -12,7 +12,6 @@ #include "base/command_line.h" #include "base/file_util.h" #include "base/files/file_path.h" -#include "base/files/scoped_file.h" #include "base/format_macros.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" @@ -251,14 +250,15 @@ Status LaunchDesktopChrome( #if defined(OS_POSIX) base::FileHandleMappingVector no_stderr; - base::ScopedFD devnull; + int devnull = -1; + file_util::ScopedFD scoped_devnull(&devnull); if (!CommandLine::ForCurrentProcess()->HasSwitch("verbose")) { // Redirect stderr to /dev/null, so that Chrome log spew doesn't confuse // users. - devnull.reset(open("/dev/null", O_WRONLY)); - if (!devnull.is_valid()) + devnull = open("/dev/null", O_WRONLY); + if (devnull == -1) return Status(kUnknownError, "couldn't open /dev/null"); - no_stderr.push_back(std::make_pair(devnull.get(), STDERR_FILENO)); + no_stderr.push_back(std::make_pair(devnull, STDERR_FILENO)); options.fds_to_remap = &no_stderr; } #endif |