Make out-of-process tests output correct XML file (re-submitting due to wrong revert)

- Disable XML output for children
- Output XML file with failed, disabled and timing information in the
  parent launcher process.

BUG=40473,42781
TEST=run the browser_tests (or other tests that uses out-of-proc-test runner) with 1) --gtest_output=xml 2) --gtest_output=xml:test.xml 3) --gtest_output=xml:/tmp/ and see if the output XML file (test_detail.xml for 1), test.xml for 2), /tmp/browser_tests.xml for 3)) contains correct information.
TBR=phajdan.jr,satorux

Review URL: http://codereview.chromium.org/2148002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48028 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 2 deletions

diff --git a/base/command_line.h b/base/command_line.h
index b6b1028..b2b4185 100644
--- a/base/command_line.h
+++ b/base/command_line.h
@@ -129,8 +129,11 @@ class CommandLine {
   // Get the number of switches in this process.
   size_t GetSwitchCount() const { return switches_.size(); }
 
+  // The type of map for parsed-out switch key and values.
+  typedef std::map<std::string, StringType> SwitchMap;
+
   // Get a copy of all switches, along with their values
-  std::map<std::string, StringType> GetSwitches() const {
+  SwitchMap GetSwitches() const {
     return switches_;
   }
 
@@ -232,7 +235,7 @@ class CommandLine {
                        StringType* switch_value);
 
   // Parsed-out values.
-  std::map<std::string, StringType> switches_;
+  SwitchMap switches_;
 
   // Non-switch command-line arguments.
   std::vector<StringType> loose_values_;