| commit | 5d77b62f8a379642eb42c1b93c83580959601cb2 | [log] [tgz] |
|---|---|---|
| author | Kyle Williams <[email protected]> | Thu Oct 08 17:26:23 2020 |
| committer | Commit Bot <[email protected]> | Thu Oct 08 17:26:23 2020 |
| tree | 4ccdf0e52d51ace560ada193e14fc4b6429a9c1d | |
| parent | cf5ba9e9fbc17625770efdf824b24a80d6a74a44 [diff] |
cfm: Fix feature flags for CfM client services Build and Feature flags disables CfmHotlineClient dbus registation for none CfM devices; as such ensure gating logic accurately disables all CfM specific code paths in chromium. BUG=b:170262024 TEST="autoninja -C ~/chromium/src/out_excelsior/Release chrome" (cherry picked from commit 56e3e262fc61c3c01c2683c436aeec85c85ea217) Change-Id: I6e47187cd667a191333c829494f5088b0df58d23 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2459170 Reviewed-by: Xiyuan Xia <[email protected]> Commit-Queue: Kyle Williams <[email protected]> Cr-Original-Commit-Position: refs/heads/master@{#814951} Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2461546 Commit-Queue: Xiyuan Xia <[email protected]> Cr-Commit-Position: refs/branch-heads/4280@{#151} Cr-Branched-From: ea420fb963f9658c9969b6513c56b8f47efa1a2a-refs/heads/master@{#812852}
diff --git a/chrome/browser/chromeos/cfm/cfm_chrome_services.cc b/chrome/browser/chromeos/cfm/cfm_chrome_services.cc index cf8525e..ea95b11 100644 --- a/chrome/browser/chromeos/cfm/cfm_chrome_services.cc +++ b/chrome/browser/chromeos/cfm/cfm_chrome_services.cc
@@ -12,8 +12,8 @@ void InitializeCfmServices() { if (!base::FeatureList::IsEnabled( - chromeos::cfm::features::kCfmMojoServices) && - CfmHotlineClient::Get()) { + chromeos::cfm::features::kCfmMojoServices) || + !CfmHotlineClient::Get()) { return; }