AU: Mix stdout and stderr together in the logs.

subprocess.h

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_SUBPROCESS_H__
 #define CHROMEOS_PLATFORM_UPDATE_ENGINE_SUBPROCESS_H__
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 45 matching lines @@
     return false;
   }
  private:
   // The global instance
   static Subprocess* subprocess_singleton_;
 
   // Callback for when any subprocess terminates. This calls the user
   // requested callback.
   static void GChildExitedCallback(GPid pid, gint status, gpointer data);
 
+  // Callback which runs in the child before exec to redirect stderr onto
+  // stdout.
+  static void GRedirectStderrToStdout(gpointer user_data);
+
   struct SubprocessCallbackRecord {
     ExecCallback callback;
     void* callback_data;
   };
 
   std::map<int, SubprocessCallbackRecord> callback_records_;
 
   Subprocess() {}
   DISALLOW_COPY_AND_ASSIGN(Subprocess);
 };
 
 }  // namespace chromeos_update_engine
 
 #endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_SUBPROCESS_H__