Revert 62699 - [Sync] Added some switches for testing/debugging.

Added back in --sync-invalidate-xmpp-login (now, not only in debug mode!).

Added --sync-allow-insecure-xmpp-connection, which enables sync to
connect to insecure XMPP servers (e.g., a local one).

Removed obsolete --use-ssl-tcp switch.

Reason for revert: Broke sync_integration_tests.

BUG=None
TEST=Manual

Review URL: http://codereview.chromium.org/3766004

TBR=akalin@chromium.org
Review URL: http://codereview.chromium.org/3906001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63097 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 6 insertions, 15 deletions

diff --git a/jingle/notifier/listener/mediator_thread_impl.cc b/jingle/notifier/listener/mediator_thread_impl.cc
index 8432198..24ff3a34 100644
--- a/jingle/notifier/listener/mediator_thread_impl.cc
+++ b/jingle/notifier/listener/mediator_thread_impl.cc
@@ -154,7 +154,8 @@ void MediatorThreadImpl::DoLogin(
                                    options,
                                    host_resolver_.get(),
                                    server_list,
-                                   server_list_count));
+                                   server_list_count,
+                                   notifier_options_.try_ssltcp_first));
 
   login_->SignalConnect.connect(
       this, &MediatorThreadImpl::OnConnect);
diff --git a/jingle/notifier/listener/talk_mediator_impl.cc b/jingle/notifier/listener/talk_mediator_impl.cc
index 2221e04..bf86f91 100644
--- a/jingle/notifier/listener/talk_mediator_impl.cc
+++ b/jingle/notifier/listener/talk_mediator_impl.cc
@@ -13,12 +13,10 @@
 namespace notifier {
 
 TalkMediatorImpl::TalkMediatorImpl(
-    MediatorThread* mediator_thread, bool invalidate_xmpp_auth_token,
-    bool allow_insecure_connection)
+    MediatorThread* mediator_thread, bool invalidate_xmpp_auth_token)
     : delegate_(NULL),
       mediator_thread_(mediator_thread),
-      invalidate_xmpp_auth_token_(invalidate_xmpp_auth_token),
-      allow_insecure_connection_(allow_insecure_connection) {
+      invalidate_xmpp_auth_token_(invalidate_xmpp_auth_token) {
   DCHECK(non_thread_safe_.CalledOnValidThread());
   mediator_thread_->Start();
   state_.started = 1;
@@ -92,10 +90,6 @@ bool TalkMediatorImpl::SetAuthToken(const std::string& email,
   xmpp_settings_.set_auth_cookie(invalidate_xmpp_auth_token_ ?
                                  token + "bogus" : token);
   xmpp_settings_.set_token_service(token_service);
-  if (allow_insecure_connection_) {
-    xmpp_settings_.set_allow_plain(true);
-    xmpp_settings_.set_use_tls(false);
-  }
 
   state_.initialized = 1;
   return true;
diff --git a/jingle/notifier/listener/talk_mediator_impl.h b/jingle/notifier/listener/talk_mediator_impl.h
index d5b9d2f..34ecd8c 100644
--- a/jingle/notifier/listener/talk_mediator_impl.h
+++ b/jingle/notifier/listener/talk_mediator_impl.h
@@ -27,8 +27,7 @@ class TalkMediatorImpl
  public:
   // Takes ownership of |mediator_thread|.
   TalkMediatorImpl(
-      MediatorThread* mediator_thread, bool invalidate_xmpp_auth_token,
-      bool allow_insecure_connection);
+      MediatorThread* mediator_thread, bool invalidate_xmpp_auth_token);
   virtual ~TalkMediatorImpl();
 
   // TalkMediator implementation.
@@ -86,7 +85,6 @@ class TalkMediatorImpl
   scoped_ptr<MediatorThread> mediator_thread_;
 
   const bool invalidate_xmpp_auth_token_;
-  const bool allow_insecure_connection_;
 
   std::vector<std::string> subscribed_services_list_;
 
diff --git a/jingle/notifier/listener/talk_mediator_unittest.cc b/jingle/notifier/listener/talk_mediator_unittest.cc
index 0d0f9e3..e00539d 100644
--- a/jingle/notifier/listener/talk_mediator_unittest.cc
+++ b/jingle/notifier/listener/talk_mediator_unittest.cc
@@ -41,10 +41,8 @@ class TalkMediatorImplTest : public testing::Test {
   TalkMediatorImpl* NewMockedTalkMediator(
       MockMediatorThread* mock_mediator_thread) {
     const bool kInvalidateXmppAuthToken = false;
-    const bool kAllowInsecureConnection = false;
     return new TalkMediatorImpl(mock_mediator_thread,
-                                kInvalidateXmppAuthToken,
-                                kAllowInsecureConnection);
+                                kInvalidateXmppAuthToken);
   }
 
   int last_message_;