Integrate about:conflicts with --diagnostics...

chrome/browser/diagnostics/diagnostics_main.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
 #include "chrome/browser/diagnostics/diagnostics_main.h"
 
 #if defined(OS_POSIX)
 #include <stdio.h>
 #include <unistd.h>
 #endif
 
@@ skipping 185 matching lines @@
 }
 #endif
 
 // This class wraps a SimpleConsole for the specific use case of
 // writing the results of the diagnostic tests.
 // TODO(cpu) figure out the localization strategy.
 class TestWriter {
  public:
   // The |console| must be valid and properly initialized. This
   // class does not own it.
-  explicit TestWriter(SimpleConsole* console) : console_(console) {
+  explicit TestWriter(SimpleConsole* console)
+      : console_(console),
+        failures_(0) {
   }
 
+  // How many tests reported failure.
+  int failures() { return failures_; }
+
   // Write an informational line of text in white over black.
   bool WriteInfoText(const std::wstring& txt) {
     console_->SetColor(SimpleConsole::DEFAULT);
     return console_->Write(txt);
   }
 
   // Write a result block. It consist of two lines. The first line
   // has [PASS] or [FAIL] with |name| and the second line has
   // the text in |extra|.
   bool WriteResult(bool success, const std::wstring& name,
                    const std::wstring& extra) {
     if (success) {
       console_->SetColor(SimpleConsole::GREEN);
       console_->Write(L"[PASS] ");
     } else {
       console_->SetColor(SimpleConsole::RED);
       console_->Write(L"[FAIL] ");
+      failures_++;
     }
     WriteInfoText(name + L"\n");
     std::wstring second_line(L"   ");
     second_line.append(extra);
     return WriteInfoText(second_line + L"\n\n");
   }
 
  private:
 
   SimpleConsole* console_;
 
+  // Keeps track of how many tests reported failure.
+  int failures_;
+
   DISALLOW_COPY_AND_ASSIGN(TestWriter);
 };
 
 std::wstring PrintableUSCurrentTime() {
   base::Time::Exploded exploded = {0};
   base::Time::Now().UTCExplode(&exploded);
   return StringPrintf(L"%d:%d:%d.%d:%d:%d",
       exploded.year, exploded.month, exploded.day_of_month,
       exploded.hour, exploded.minute, exploded.second);
 }
@@ skipping 35 matching lines @@
   virtual void OnSkipped(int id, DiagnosticsModel* model) {
     // TODO(cpu): display skipped tests.
   }
 
   virtual void OnFinished(int id, DiagnosticsModel* model) {
     // As each test completes we output the results.
     ShowResult(model->GetTest(id));
   }
 
   virtual void OnDoneAll(DiagnosticsModel* model) {
-    writer_->WriteInfoText(L"DONE\n\n");
+    if (writer_->failures() > 0) {
+      writer_->WriteInfoText(StringPrintf(L"DONE. %d failure(s)\n\n",
+                             writer_->failures()));
+    } else {
+      writer_->WriteInfoText(L"DONE\n\n");
+    }
   }
 
  private:
   void ShowResult(DiagnosticsModel::TestInfo& test_info) {
     bool success = (DiagnosticsModel::TEST_OK == test_info.GetResult());
     writer_->WriteResult(success, UTF16ToWide(test_info.GetTitle()),
                          UTF16ToWide(test_info.GetAdditionalInfo()));
   }
 
   DiagnosticsModel* model_;
@@ skipping 39 matching lines @@
   // Windows.
 #if defined(OS_WIN)
   // Block here so the user can see the results.
   writer.WriteInfoText(L"Press [enter] to continue\n");
   std::wstring txt;
   console->Read(&txt);
 #endif
   delete console;
   return 0;
 }