Delete unused flag "sync-allow-insecure-xmpp-connection"

Technically it was used in invalidation::ParseNotifierOptions, which
however was itself unused and is also removed.

Bug: none
Change-Id: Ic3e6bdc88a381875760892131479cecc4ac4dfe4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1942658
Commit-Queue: Tim Schumann <tschumann@chromium.org>
Auto-Submit: Marc Treib <treib@chromium.org>
Reviewed-by: Tim Schumann <tschumann@chromium.org>
Cr-Commit-Position: refs/heads/master@{#720160}

chrome/browser/ui/startup/bad_flags_prompt.cc

@@ -24,7 +24,6 @@
 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_switches.h"
 #include "components/infobars/core/infobar_delegate.h"
 #include "components/infobars/core/simple_alert_infobar_delegate.h"
-#include "components/invalidation/impl/invalidation_switches.h"
 #include "components/nacl/common/buildflags.h"
 #include "components/nacl/common/nacl_switches.h"
 #include "components/network_session_configurator/common/network_switches.h"
@@ -78,7 +77,6 @@ static const char* kBadFlags[] = {
     // These flags undermine HTTPS / connection security.
     switches::kDisableWebRtcEncryption,
     switches::kIgnoreCertificateErrors,
-    invalidation::switches::kSyncAllowInsecureXmppConnection,
 
     // These flags change the URLs that handle PII.
     switches::kGaiaUrl,

components/invalidation/impl/invalidation_service_util.cc

@@ -5,34 +5,11 @@
 #include "components/invalidation/impl/invalidation_service_util.h"
 
 #include "base/base64.h"
-#include "base/command_line.h"
 #include "base/logging.h"
 #include "base/rand_util.h"
-#include "components/invalidation/impl/invalidation_switches.h"
 
 namespace invalidation {
 
-notifier::NotifierOptions ParseNotifierOptions(
-    const base::CommandLine& command_line) {
-  notifier::NotifierOptions notifier_options;
-
-  if (command_line.HasSwitch(switches::kSyncNotificationHostPort)) {
-    notifier_options.xmpp_host_port =
-        net::HostPortPair::FromString(
-            command_line.GetSwitchValueASCII(
-                switches::kSyncNotificationHostPort));
-    DVLOG(1) << "Using " << notifier_options.xmpp_host_port.ToString()
-             << " for test sync notification server.";
-  }
-
-  notifier_options.allow_insecure_connection =
-      command_line.HasSwitch(switches::kSyncAllowInsecureXmppConnection);
-  DVLOG_IF(1, notifier_options.allow_insecure_connection)
-      << "Allowing insecure XMPP connections.";
-
-  return notifier_options;
-}
-
 std::string GenerateInvalidatorClientId() {
   // Generate a GUID with 128 bits worth of base64-encoded randomness.
   // This format is similar to that of sync's cache_guid.

components/invalidation/impl/invalidation_service_util.h

@@ -5,18 +5,10 @@
 #ifndef COMPONENTS_INVALIDATION_IMPL_INVALIDATION_SERVICE_UTIL_H_
 #define COMPONENTS_INVALIDATION_IMPL_INVALIDATION_SERVICE_UTIL_H_
 
-#include "jingle/notifier/base/notifier_options.h"
-
-namespace base {
-class CommandLine;
-}
+#include <string>
 
 namespace invalidation {
 
-// Parses the given command line for notifier options.
-notifier::NotifierOptions ParseNotifierOptions(
-    const base::CommandLine& command_line);
-
 // Generates a unique client ID for the invalidator.
 std::string GenerateInvalidatorClientId();
 

components/invalidation/impl/invalidation_switches.cc

@@ -15,10 +15,6 @@ const char kInvalidationUseGCMChannel[] = "invalidation-use-gcm-channel";
 // Overrides the default host:port used for notifications.
 const char kSyncNotificationHostPort[] = "sync-notification-host-port";
 
-// Allows insecure XMPP connections for sync (for testing).
-const char kSyncAllowInsecureXmppConnection[] =
-    "sync-allow-insecure-xmpp-connection";
-
 const base::Feature kFCMInvalidationsConservativeEnabling = {
     "FCMInvalidationsConservativeEnabling", base::FEATURE_ENABLED_BY_DEFAULT};
 

components/invalidation/impl/invalidation_switches.h

@@ -16,7 +16,6 @@ extern const char kInvalidationUseGCMChannel[];
 #endif  // OS_CHROMEOS
 
 extern const char kSyncNotificationHostPort[];
-extern const char kSyncAllowInsecureXmppConnection[];
 extern const base::Feature kFCMInvalidationsConservativeEnabling;
 extern const base::Feature kFCMInvalidationsStartOnceActiveAccountAvailable;
 extern const base::Feature kFCMInvalidationsForSyncDontCheckVersion;