[win] Create utilities for helping to populate ModuleDatabase.

chrome/browser/win/enumerate_modules_model.h

 // 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.
 
 #ifndef CHROME_BROWSER_WIN_ENUMERATE_MODULES_MODEL_H_
 #define CHROME_BROWSER_WIN_ENUMERATE_MODULES_MODEL_H_
 
 #include <memory>
 #include <utility>
 #include <vector>
 
 #include "base/files/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "base/strings/string16.h"
 #include "base/timer/timer.h"
+#include "chrome/browser/conflicts/module_info_util_win.h"
 #include "content/public/browser/browser_thread.h"
 #include "url/gurl.h"
 
 class EnumerateModulesModel;
 
 namespace base {
 class ListValue;
 }
 
 // A helper class that implements the enumerate module functionality on the FILE
@@ skipping 38 matching lines @@
     SEE_LINK      = 1 << 4,
     NOTIFY_USER   = 1 << 5,
   };
 
   // Which Windows OS is affected.
   enum OperatingSystem {
     ALL          = -1,
     XP           = 1 << 0,
   };
 
-  // The type of certificate found for the module.
-  enum CertificateType {
-    NO_CERTIFICATE,
-    CERTIFICATE_IN_FILE,
-    CERTIFICATE_IN_CATALOG,
-  };
-
-  // Information about the certificate of a file.
-  struct CertificateInfo {
-    CertificateInfo();
-
-    // The type of signature encountered.
-    CertificateType type;
-    // Path to the file containing the certificate. Empty if NO_CERTIFICATE.
-    base::FilePath path;
-    // The "Subject" name of the certificate.
-    base::string16 subject;
-  };
-
   // The structure we populate when enumerating modules.
   struct Module {
     Module();
     Module(const Module& rhs);
     // Constructor exposed for unittesting.
     Module(ModuleType type,
            ModuleStatus status,
            const base::string16& location,
            const base::string16& name,
            const base::string16& product_name,
@@ skipping 14 matching lines @@
     base::string16 product_name;
     // The module file description.
     base::string16 description;
     // The module version.
     base::string16 version;
     // The help tips bitmask.
     RecommendedAction recommended_action;
     // The duplicate count within each category of modules.
     int duplicate_count;
     // The certificate info for the module.
-    CertificateInfo cert_info;
+    ModuleDatabase::CertificateInfo cert_info;
   };
 
   // A vector typedef of all modules enumerated.
   typedef std::vector<Module> ModulesVector;
 
   // A static function that normalizes the module information in the |module|
   // struct. Module information needs to be normalized before comparing against
   // the blacklist. This is because the same module can be described in many
   // different ways, ie. file paths can be presented in long/short name form,
   // and are not case sensitive on Windows. Also, the version string returned
@@ skipping 243 matching lines @@
   // The number of suspected bad modules (not including confirmed bad ones)
   // found during last scan. Only modified on the UI thread.
   int suspected_bad_modules_detected_;
 
   base::ObserverList<Observer> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(EnumerateModulesModel);
 };
 
 #endif  // CHROME_BROWSER_WIN_ENUMERATE_MODULES_MODEL_H_