Fix failing tests in chrome/browser/conflicts

A recent change made it so that only modules loaded in certain process
types are considered for both the IncompatibleApplicationsUpdater and
ModuleBlacklistCacheUpdater, but the tests were not updated.

Bug: 946999
Change-Id: I522f7bbf00eb239de59a9e7401f74a6183f35d84
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1542427Reviewed-by: Etienne Bergeron <etienneb@chromium.org>
Commit-Queue: Patrick Monette <pmonette@chromium.org>
Cr-Commit-Position: refs/heads/master@{#645345}

chrome/browser/conflicts/incompatible_applications_updater_win_unittest.cc

@@ -18,6 +18,7 @@
 #include "chrome/browser/conflicts/module_list_filter_win.h"
 #include "chrome/test/base/scoped_testing_local_state.h"
 #include "chrome/test/base/testing_browser_process.h"
+#include "content/public/common/process_type.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -80,11 +81,12 @@ constexpr wchar_t kCertificateSubject[] = L"CertificateSubject";
 constexpr wchar_t kDllPath1[] = L"c:\\path\\to\\module.dll";
 constexpr wchar_t kDllPath2[] = L"c:\\some\\shellextension.dll";
 
-// Returns a new ModuleInfoData marked as loaded into the process but otherwise
-// empty.
+// Returns a new ModuleInfoData marked as loaded into the browser process but
+// otherwise empty.
 ModuleInfoData CreateLoadedModuleInfoData() {
   ModuleInfoData module_data;
   module_data.module_properties |= ModuleInfoData::kPropertyLoadedModule;
+  module_data.process_types |= ProcessTypeToBit(content::PROCESS_TYPE_BROWSER);
   module_data.inspection_result = base::make_optional<ModuleInspectionResult>();
   return module_data;
 }

chrome/browser/conflicts/module_blacklist_cache_updater_win_unittest.cc

@@ -32,6 +32,7 @@
 #include "chrome/browser/conflicts/module_list_filter_win.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/install_static/install_util.h"
+#include "content/public/common/process_type.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
@@ -46,11 +47,12 @@ constexpr base::FilePath::CharType kDllPath1[] =
 constexpr base::FilePath::CharType kDllPath2[] =
     FILE_PATH_LITERAL("c:\\some\\shellextension.dll");
 
-// Returns a new ModuleInfoData marked as loaded into the process but otherwise
-// empty.
+// Returns a new ModuleInfoData marked as loaded into the browser process but
+// otherwise empty.
 ModuleInfoData CreateLoadedModuleInfoData() {
   ModuleInfoData module_data;
   module_data.module_properties |= ModuleInfoData::kPropertyLoadedModule;
+  module_data.process_types |= ProcessTypeToBit(content::PROCESS_TYPE_BROWSER);
   module_data.inspection_result = base::make_optional<ModuleInspectionResult>();
   return module_data;
 }