From 1d1e68efc0a14fe775c001319569f0ec8dd1bc8f Mon Sep 17 00:00:00 2001 From: "akalin@chromium.org" Date: Tue, 15 May 2012 00:09:53 +0000 Subject: [Sync] Clean up XMPP connection code Remove dead DNS-resolution-related code. Remove complicated XmppConnectionGenerator class now that we don't have to do DNS resolution ourselves. Move the simplified logic into MakeConnectionSettingsList(). Add unit tests for it. Remove unused ConnectionOptions struct. Simplify SingleLoginAttempt a bit and add tests for it. Also document redirection protocol. Simplify LoginSettings and add tests for it. Move redirection timeout logic from Login to LoginSettings. Replace some bools with enums. Document sketchy (but necessary) include of libjingle's p2p/port.h. Some minor cleanup here and there. BUG=38091 TEST= Review URL: https://chromiumcodereview.appspot.com/10391084 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137027 0039d316-1c4b-4281-b951-d872f2087c98 --- jingle/jingle.gyp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'jingle/jingle.gyp') diff --git a/jingle/jingle.gyp b/jingle/jingle.gyp index b940bd6..02a5a05 100644 --- a/jingle/jingle.gyp +++ b/jingle/jingle.gyp @@ -67,8 +67,6 @@ 'notifier/base/xmpp_client_socket_factory.h', 'notifier/base/xmpp_connection.cc', 'notifier/base/xmpp_connection.h', - 'notifier/communicator/connection_options.cc', - 'notifier/communicator/connection_options.h', 'notifier/communicator/connection_settings.cc', 'notifier/communicator/connection_settings.h', 'notifier/communicator/login.cc', @@ -77,8 +75,6 @@ 'notifier/communicator/login_settings.h', 'notifier/communicator/single_login_attempt.cc', 'notifier/communicator/single_login_attempt.h', - 'notifier/communicator/xmpp_connection_generator.cc', - 'notifier/communicator/xmpp_connection_generator.h', 'notifier/listener/mediator_thread.h', 'notifier/listener/mediator_thread_impl.cc', 'notifier/listener/mediator_thread_impl.h', @@ -165,7 +161,9 @@ 'notifier/base/task_pump_unittest.cc', 'notifier/base/xmpp_connection_unittest.cc', 'notifier/base/weak_xmpp_client_unittest.cc', - 'notifier/communicator/xmpp_connection_generator_unittest.cc', + 'notifier/communicator/connection_settings_unittest.cc', + 'notifier/communicator/login_settings_unittest.cc', + 'notifier/communicator/single_login_attempt_unittest.cc', 'notifier/listener/mediator_thread_mock.cc', 'notifier/listener/mediator_thread_mock.h', 'notifier/listener/mediator_thread_unittest.cc', -- cgit v1.1