Add ModuleInspector

chrome/browser/conflicts/module_database_win.h

 // Copyright 2017 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_CONFLICTS_MODULE_DATABASE_WIN_H_
 #define CHROME_BROWSER_CONFLICTS_MODULE_DATABASE_WIN_H_
 
 #include <map>
 #include <memory>
 #include <utility>
 #include <vector>
 
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/sequenced_task_runner.h"
 #include "chrome/browser/conflicts/module_info_win.h"
+#include "chrome/browser/conflicts/module_inspector_win.h"
 #include "content/public/common/process_type.h"
 
 // A class that keeps track of all modules loaded across Chrome processes.
 // Drives the chrome://conflicts UI.
 //
 // This is effectively a singleton, but doesn't use base::Singleton. The intent
 // is for the object to be created when Chrome is single-threaded, and for it
 // be set as the process-wide singleton via SetInstance.
-class ModuleDatabase {
+class ModuleDatabase : public ModuleInspector::Delegate {

[chrisha, 2017/03/01 16:03:38]

Is delegate the right pattern here? A delegate does work on behalf of a class,
and is injected.

This seems more like we're an observer. And given that there's a single function
(OnModuleInspected), maybe we should just use a callback?

[Patrick Monette, 2017/03/03 22:16:29]

Using a callback sgtm. Done.

  public:
   // Structures for maintaining information about modules.
   using ModuleMap = std::map<ModuleInfoKey, ModuleInfoData>;
   using ModuleInfo = ModuleMap::value_type;
 
   // Used for maintaing a list of modules loaded in a process. Maps module IDs
   // to load addresses.
   using ModuleLoadAddresses = std::vector<std::pair<ModuleId, uintptr_t>>;
 
   // Structures for maintaining information about running processes.
@@ skipping 98 matching lines @@
   ProcessInfo* GetProcessInfo(uint32_t process_id, uint64_t creation_time);
 
   // Creates a process info entry.
   void CreateProcessInfo(uint32_t process_id,
                          uint64_t creation_time,
                          content::ProcessType process_type);
 
   // Deletes a process info entry.
   void DeleteProcessInfo(uint32_t process_id, uint64_t creation_time);
 
+  // ModuleInspector::Delegate:
+  void OnModuleInspected(const ModuleInfoKey& module_key,
+                         const ModuleInfoData& module_data) override;
+
   // The task runner to which this object is bound.
   scoped_refptr<base::SequencedTaskRunner> task_runner_;
 
   // A map of all known modules.
   ModuleMap modules_;
 
+  // Inspects new modules on a blocking task runner.
+  ModuleInspector module_inspector_;
+
   // A map of all known running processes, and modules loaded/unloaded in
   // them.
   ProcessMap processes_;
 
   // Weak pointer factory for this object. This is used when bouncing
   // incoming events to |task_runner_|.
   base::WeakPtrFactory<ModuleDatabase> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ModuleDatabase);
 };
@@ skipping 37 matching lines @@
   //
   // These are modified by the various static *LoadAddress* helper functions in
   // ModuleDatabase. The vector maintains the invariant the element with maximum
   // module ID is always last. This ensures that the usual operation of loading
   // a module is O(1).
   ModuleLoadAddresses loaded_modules;
   ModuleLoadAddresses unloaded_modules;
 };
 
 #endif  // CHROME_BROWSER_CONFLICTS_MODULE_DATABASE_WIN_H_