Enable Click to Call registration and receiving by default.

Also clean up some of the platform conditions.

Bug: 987970
Change-Id: Ie15353400163599dc97bc15c2658650c8d1c0ca1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1720636
Commit-Queue: Michael van Ouwerkerk <[email protected]>
Reviewed-by: Richard Knoll <[email protected]>
Cr-Commit-Position: refs/heads/master@{#681282}
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 5e98d3f..5bad519b 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -3548,15 +3548,17 @@
          chromeos::assistant::features::kEnableMediaSessionIntegration)},
 #endif  // defined(OS_CHROMEOS)
 
-#if !defined(OS_CHROMEOS)
+#if defined(OS_ANDROID)
     {"click-to-call-receiver", flag_descriptions::kClickToCallReceiverName,
-     flag_descriptions::kClickToCallReceiverDescription, kOsAll,
+     flag_descriptions::kClickToCallReceiverDescription, kOsAndroid,
      FEATURE_VALUE_TYPE(kClickToCallReceiver)},
+#endif  // defined(OS_ANDROID)
 
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
     {"click-to-call-ui", flag_descriptions::kClickToCallUIName,
-     flag_descriptions::kClickToCallUIDescription, kOsAll,
+     flag_descriptions::kClickToCallUIDescription, kOsWin | kOsMac | kOsLinux,
      FEATURE_VALUE_TYPE(kClickToCallUI)},
-#endif  // !defined(OS_CHROMEOS)
+#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
 
     {"enable-ambient-authentication-in-incognito",
      flag_descriptions::kEnableAmbientAuthenticationInIncognitoName,