Basic console output for diagnostics mode windows-only

Also Wires --diagnostics to the diagnostics entry point
start chrome with --diagnostics and watch pretty output

BUG=27885
TEST= unit tests included

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

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

1 files changed, 6 insertions, 1 deletions

diff --git a/chrome/browser/diagnostics/diagnostics_model_unittest.cc b/chrome/browser/diagnostics/diagnostics_model_unittest.cc
index f6a7697..442db84 100644
--- a/chrome/browser/diagnostics/diagnostics_model_unittest.cc
+++ b/chrome/browser/diagnostics/diagnostics_model_unittest.cc
@@ -27,7 +27,7 @@ class DiagnosticsModelTest : public testing::Test {
 // The test observer is used to know if the callbacks are being called.
 class UTObserver: public DiagnosticsModel::Observer {
  public:
-  UTObserver() : done_(false), progress_called_(0) {}
+  UTObserver() : done_(false), progress_called_(0), finished_(0) {}
 
   virtual void OnProgress(int id, int percent, DiagnosticsModel* model) {
     EXPECT_TRUE(model != NULL);
@@ -40,6 +40,7 @@ class UTObserver: public DiagnosticsModel::Observer {
 
   virtual void OnFinished(int id, DiagnosticsModel* model) {
     EXPECT_TRUE(model != NULL);
+    ++finished_;
   }
 
   virtual void OnDoneAll(DiagnosticsModel* model) {
@@ -51,9 +52,12 @@ class UTObserver: public DiagnosticsModel::Observer {
 
   int progress_called() const { return progress_called_; }
 
+  int finished() const { return finished_;}
+
  private:
   bool done_;
   int progress_called_;
+  int finished_;
 };
 
 // Test that the initial state is correct. We only have one test
@@ -73,4 +77,5 @@ TEST_F(DiagnosticsModelTest, RunAll) {
   EXPECT_TRUE(observer.done());
   EXPECT_GT(observer.progress_called(), 0);
   EXPECT_EQ(1, model_->GetTestRunCount());
+  EXPECT_EQ(1, observer.finished());
 }