[Win] Add reporting of total number of modules loaded in browser process.

chrome/browser/diagnostics/diagnostics_model.cc

 // 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 <algorithm>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/path_service.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "build/build_config.h"
 #include "chrome/browser/diagnostics/diagnostics_test.h"
 #include "chrome/browser/diagnostics/recon_diagnostics.h"
 #include "chrome/browser/diagnostics/sqlite_diagnostics.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 
 namespace diagnostics {
 
 // This is the count of diagnostic tests on each platform.  This should
 // only be used by testing code.
 #if defined(OS_WIN)
-const int DiagnosticsModel::kDiagnosticsTestCount = 18;
+const int DiagnosticsModel::kDiagnosticsTestCount = 17;
 #elif defined(OS_MACOSX)
 const int DiagnosticsModel::kDiagnosticsTestCount = 14;
 #elif defined(OS_POSIX)
 #if defined(OS_CHROMEOS)
 const int DiagnosticsModel::kDiagnosticsTestCount = 18;
 #else
 const int DiagnosticsModel::kDiagnosticsTestCount = 16;
 #endif
 #endif
 
@@ skipping 105 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(DiagnosticsModelImpl);
 };
 
 // Each platform can have their own tests. For the time being there is only
 // one test that works on all platforms.
 #if defined(OS_WIN)
 class DiagnosticsModelWin : public DiagnosticsModelImpl {
  public:
   DiagnosticsModelWin() {
     tests_.push_back(MakeOperatingSystemTest());
-    tests_.push_back(MakeConflictingDllsTest());
     tests_.push_back(MakeInstallTypeTest());
     tests_.push_back(MakeVersionTest());
     tests_.push_back(MakeUserDirTest());
     tests_.push_back(MakeLocalStateFileTest());
     tests_.push_back(MakeDictonaryDirTest());
     tests_.push_back(MakeResourcesFileTest());
     tests_.push_back(MakeDiskSpaceTest());
     tests_.push_back(MakePreferencesTest());
     tests_.push_back(MakeLocalStateTest());
     tests_.push_back(MakeBookMarksTest());
@@ skipping 75 matching lines @@
 #if defined(OS_WIN)
   return new DiagnosticsModelWin();
 #elif defined(OS_MACOSX)
   return new DiagnosticsModelMac();
 #elif defined(OS_POSIX)
   return new DiagnosticsModelPosix();
 #endif
 }
 
 }  // namespace diagnostics