diff options
| author | hashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-27 08:23:31 +0000 |
|---|---|---|
| committer | hashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-27 08:23:31 +0000 |
| commit | ecb10fa1d0b06ba322e0782a1becb67730f69707 (patch) | |
| tree | e1b944d00a329f9ef0837870a80d09bd01cfa310 /tools/gn | |
| parent | 4e5a81b5606ea6bd7be2f631e52e93d0d3b23902 (diff) | |
| download | chromium_src-ecb10fa1d0b06ba322e0782a1becb67730f69707.zip chromium_src-ecb10fa1d0b06ba322e0782a1becb67730f69707.tar.gz chromium_src-ecb10fa1d0b06ba322e0782a1becb67730f69707.tar.bz2 | |
Revert of https://codereview.chromium.org/71013004/
Reason for revert: Causing compile failure in chrome_util.cc on "Google Chrome Win" http://build.chromium.org/p/chromium.chrome/builders/Google%20Chrome%20Win/builds/21803
TBR=cpu@chromium.org,jvoung@chromium.org,thakis@chromium.org,sergeyu@chromium.org,grt@chromium.org,gene@chromium.org,youngki@chromium.org,rvargas@chromium.org
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/90963002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237541 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/gn')
| -rw-r--r-- | tools/gn/function_exec_script.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tools/gn/function_exec_script.cc b/tools/gn/function_exec_script.cc index cca62a3..b382575 100644 --- a/tools/gn/function_exec_script.cc +++ b/tools/gn/function_exec_script.cc @@ -85,7 +85,8 @@ bool ExecProcess(const CommandLine& cmdline, base::FilePath::StringType cmdline_str(cmdline.GetCommandLineString()); - STARTUPINFO start_info = {}; + base::win::ScopedProcessInformation proc_info; + STARTUPINFO start_info = { 0 }; start_info.cb = sizeof(STARTUPINFO); start_info.hStdOutput = out_write; @@ -97,17 +98,15 @@ bool ExecProcess(const CommandLine& cmdline, start_info.dwFlags |= STARTF_USESTDHANDLES; // Create the child process. - PROCESS_INFORMATION temp_process_info = {}; if (!CreateProcess(NULL, &cmdline_str[0], NULL, NULL, TRUE, // Handles are inherited. 0, NULL, startup_dir.value().c_str(), - &start_info, &temp_process_info)) { + &start_info, proc_info.Receive())) { return false; } - base::win::ScopedProcessInformation proc_info(temp_process_info); // Close our writing end of pipes now. Otherwise later read would not be able // to detect end of child's output. |