diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-27 05:57:56 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-27 05:57:56 +0000 |
| commit | 47b3c39b87cb9969d30ea05a15d07f177570cde2 (patch) | |
| tree | 82857f4243c318291902ef2d7ff5ea38ea47dcbc /jingle/notifier/communicator | |
| parent | c67895dc60ddd5b37c5a9a2a5510548f642ab11f (diff) | |
| download | chromium_src-47b3c39b87cb9969d30ea05a15d07f177570cde2.zip chromium_src-47b3c39b87cb9969d30ea05a15d07f177570cde2.tar.gz chromium_src-47b3c39b87cb9969d30ea05a15d07f177570cde2.tar.bz2 | |
[Sync] Make sync integration tests use local xmpp servers.
Fixed signed/unsigned bug with the port number.
BUG=53934
TEST=sync integration tests
Review URL: http://codereview.chromium.org/5239001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67491 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle/notifier/communicator')
| -rw-r--r-- | jingle/notifier/communicator/connection_settings.cc | 2 | ||||
| -rw-r--r-- | jingle/notifier/communicator/connection_settings.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/jingle/notifier/communicator/connection_settings.cc b/jingle/notifier/communicator/connection_settings.cc index 1648c4e..ec374cc 100644 --- a/jingle/notifier/communicator/connection_settings.cc +++ b/jingle/notifier/communicator/connection_settings.cc @@ -40,7 +40,7 @@ ConnectionSettingsList::~ConnectionSettingsList() {} void ConnectionSettingsList::AddPermutations(const std::string& hostname, const std::vector<uint32>& iplist, - int16 port, + uint16 port, bool special_port_magic, bool try_ssltcp_first) { // randomize the list. This ensures the iplist isn't always diff --git a/jingle/notifier/communicator/connection_settings.h b/jingle/notifier/communicator/connection_settings.h index b26f559..91c95af 100644 --- a/jingle/notifier/communicator/connection_settings.h +++ b/jingle/notifier/communicator/connection_settings.h @@ -9,6 +9,7 @@ #include <string> #include <vector> +#include "base/basictypes.h" #include "talk/xmpp/xmppclientsettings.h" namespace notifier { @@ -47,7 +48,7 @@ class ConnectionSettingsList { void AddPermutations(const std::string& hostname, const std::vector<uint32>& iplist, - int16 port, + uint16 port, bool special_port_magic, bool try_ssltcp_first); private: |