Augment the ThirdPartyConflictsManager state to include features status

Bug: 846953
Change-Id: I6ee9d0d9557fa981726316994661ac0aad3c9631
Reviewed-on: https://chromium-review.googlesource.com/1135696
Commit-Queue: Patrick Monette <pmonette@chromium.org>
Reviewed-by: Chris Hamilton <chrisha@chromium.org>
Cr-Commit-Position: refs/heads/master@{#574928}

chrome/browser/conflicts/third_party_conflicts_manager_win.cc

@@ -305,7 +305,13 @@ void ThirdPartyConflictsManager::InitializeIfReady() {
             module_list_filter_, *installed_applications_);
   }
 
-  SetTerminalState(State::kInitialized);
+  if (!incompatible_applications_updater_) {
+    SetTerminalState(State::kBlockingInitialized);
+  } else if (!module_blacklist_cache_updater_) {
+    SetTerminalState(State::kWarningInitialized);
+  } else {
+    SetTerminalState(State::kWarningAndBlockingInitialized);
+  }
 }
 
 void ThirdPartyConflictsManager::OnModuleBlacklistCacheUpdated(

chrome/browser/conflicts/third_party_conflicts_manager_win.h

@@ -87,10 +87,13 @@ class ThirdPartyConflictsManager
     // The initialization failed because there was no Module List version
     // available to install.
     kNoModuleListAvailableFailure,
-    // The instance is initialized. If their respective feature is enabled, the
-    // |incompatible_applications_updater_| & |module_blacklist_cache_updater_|
-    // instances are initialized.
-    kInitialized,
+    // Only the IncompatibleApplicationsWarning feature is enabled and active.
+    kWarningInitialized,
+    // Only the ThirdPartyModulesBlocking feature is enabled and active.
+    kBlockingInitialized,
+    // Both the IncompatibleApplicationsWarning and ThirdPartyModulesBlocking
+    // features are enabled and active.
+    kWarningAndBlockingInitialized,
     // The instance is about to be deleted.
     kDestroyed,
   };

chrome/browser/conflicts/third_party_conflicts_manager_win_unittest.cc

@@ -100,7 +100,7 @@ TEST_F(ThirdPartyConflictsManagerTest, InitializeBothUpdaters) {
 
   ASSERT_TRUE(final_state().has_value());
   EXPECT_EQ(final_state().value(),
-            ThirdPartyConflictsManager::State::kInitialized);
+            ThirdPartyConflictsManager::State::kWarningAndBlockingInitialized);
 }
 
 TEST_F(ThirdPartyConflictsManagerTest, InvalidModuleList) {