Disable Channel ID on all platforms except Android

Change-Id: I481ee17e83c2eef8433fa774285cf68e0b7c4ac8
Reviewed-on: https://chromium-review.googlesource.com/1041139Reviewed-by: Ryan Hamilton <rch@chromium.org>
Commit-Queue: Ryan Hamilton <rch@chromium.org>
Cr-Commit-Position: refs/heads/master@{#556899}

components/network_session_configurator/common/network_features.cc

@@ -4,12 +4,19 @@
 
 #include "components/network_session_configurator/common/network_features.h"
 
+#include "build/build_config.h"
+
 namespace features {
 
 const base::Feature kTokenBinding{"token-binding",
                                   base::FEATURE_DISABLED_BY_DEFAULT};
 
+#if defined(OS_ANDROID)
+// TODO(nharper): Disable kChannelID on all platforms in M69.
 const base::Feature kChannelID{"channel-id", base::FEATURE_ENABLED_BY_DEFAULT};
+#else
+const base::Feature kChannelID{"channel-id", base::FEATURE_DISABLED_BY_DEFAULT};
+#endif  // defined(OS_ANDROID)
 
 const base::Feature kDnsOverHttps{"dns-over-https",
                                   base::FEATURE_DISABLED_BY_DEFAULT};