Integrate about:conflicts with --diagnostics...

chrome/browser/diagnostics/diagnostics_model_unittest.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_model.h"
 
 #include "base/command_line.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // Basic harness to adquire and release the Diagnostic model object.
 class DiagnosticsModelTest : public testing::Test {
@@ skipping 59 matching lines @@
 
  private:
   bool done_;
   int progress_called_;
   int finished_;
   int id_of_failed_stop_test;
 };
 
 // We currently have more tests operational on windows.
 #if defined(OS_WIN)
-const int kDiagnosticsTestCount = 18;
+const int kDiagnosticsTestCount = 19;
 #elif defined(OS_MACOSX)
 const int kDiagnosticsTestCount = 16;
 #elif defined(OS_POSIX)
 const int kDiagnosticsTestCount = 17;
 #endif
 
 // Test that the initial state is correct.
 TEST_F(DiagnosticsModelTest, BeforeRun) {
   int available = model_->GetTestAvailableCount();
   EXPECT_EQ(kDiagnosticsTestCount, available);
   EXPECT_EQ(0, model_->GetTestRunCount());
   EXPECT_EQ(DiagnosticsModel::TEST_NOT_RUN, model_->GetTest(0).GetResult());
 }
 
 // Run all the tests, verify that the basic callbacks are run and that the
 // final state is correct.
 TEST_F(DiagnosticsModelTest, RunAll) {
   UTObserver observer;
   EXPECT_FALSE(observer.done());
   model_->RunAll(&observer);
   EXPECT_TRUE(observer.done());
   EXPECT_GT(observer.progress_called(), 0);
   EXPECT_EQ(kDiagnosticsTestCount, model_->GetTestRunCount());
   EXPECT_EQ(kDiagnosticsTestCount, observer.finished());
 }