fix official build breakage

TBR=dfried@chromium.org

Bug: 1101156
Change-Id: Ie75cfc36621166578a014b5e8290adf87bfe41dc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2277181Reviewed-by: David Bienvenu <davidbienvenu@chromium.org>
Commit-Queue: David Bienvenu <davidbienvenu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#784261}

chrome/browser/ui/webui/conflicts/conflicts_data_fetcher.cc

@@ -163,7 +163,7 @@ std::string GetModuleWarningDecisionString(
       return kAllowedSameDirectory;
     case WarningDecision::kAllowedMicrosoft:
       return kAllowedMicrosoftModule;
-    case WarningDecision::kAllowedAllowlisted:
+    case WarningDecision::kAllowedWhitelisted:
       return kAllowedAllowlisted;
     case WarningDecision::kNotAnalyzed:
       return kNotAnalyzed;
@@ -443,7 +443,7 @@ void ConflictsDataFetcher::OnNewModuleFound(const ModuleInfoKey& module_key,
     auto* module_blocklist_cache_updater =
         ModuleDatabase::GetInstance()
             ->third_party_conflicts_manager()
-            ->module_blocklist_cache_updater();
+            ->module_blacklist_cache_updater();
 
     data->SetString(
         "third_party_module_status",

chrome/browser/win/conflicts/module_blacklist_cache_updater.cc

@@ -163,7 +163,7 @@ bool ShouldInsertInBlacklistCache(ModuleBlockingDecision blocking_decision) {
     case ModuleBlockingDecision::kAllowedSameCertificate:
     case ModuleBlockingDecision::kAllowedSameDirectory:
     case ModuleBlockingDecision::kAllowedMicrosoft:
-    case ModuleBlockingDecision::kAllowedWhitelisted:
+    case ModuleBlockingDecision::kAllowedAllowlisted:
     case ModuleBlockingDecision::kTolerated:
     case ModuleBlockingDecision::kNotAnalyzed:
       return false;
@@ -377,7 +377,7 @@ ModuleBlacklistCacheUpdater::DetermineModuleBlockingDecision(
     case ModuleListState::kUnlisted:
       break;
     case ModuleListState::kWhitelisted:
-      return ModuleBlockingDecision::kAllowedWhitelisted;
+      return ModuleBlockingDecision::kAllowedAllowlisted;
     case ModuleListState::kTolerated:
       return ModuleBlockingDecision::kTolerated;
     case ModuleListState::kBlacklisted:

chrome/browser/win/conflicts/module_blacklist_cache_updater.h

@@ -92,8 +92,8 @@ class ModuleBlacklistCacheUpdater : public ModuleDatabaseObserver {
     // Allowed because it is signed by Microsoft. The certificate is not
     // validated.
     kAllowedMicrosoft,
-    // Explicitly whitelisted by the Module List component.
-    kAllowedWhitelisted,
+    // Explicitly allowed by the Module List component.
+    kAllowedAllowlisted,
     // Module analysis was interrupted using DisableModuleAnalysis(). This
     // module will not be added to the cache.
     kNotAnalyzed,
@@ -113,7 +113,7 @@ class ModuleBlacklistCacheUpdater : public ModuleDatabaseObserver {
     // blacklist.
     kDisallowedExplicit,
     // The module will be implicitly blocked because it is not otherwise
-    // whitelisted.
+    // allowed.
     kDisallowedImplicit,
     // New "disallowed" reasons should be added here!
   };