diff options
| author | thestig <thestig@chromium.org> | 2015-09-24 17:22:01 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-25 00:22:51 +0000 |
| commit | 47175a76a68bf6087d3eef3d7a1210da4441a52e (patch) | |
| tree | cfe8146d5c8f539d7dc1183a0186cc18f315606e /jingle | |
| parent | eb092a7a4b2f2aac2cc4dac4588f663d8cb5ee80 (diff) | |
| download | chromium_src-47175a76a68bf6087d3eef3d7a1210da4441a52e.zip chromium_src-47175a76a68bf6087d3eef3d7a1210da4441a52e.tar.gz chromium_src-47175a76a68bf6087d3eef3d7a1210da4441a52e.tar.bz2 | |
Use FRIEND_TEST_ALL_PREFIXES instead of FRIEND_TEST.
Also remove a custom FRIEND_TEST_ALL_PREFIXES #define from 6 years ago.
Review URL: https://codereview.chromium.org/1370563002
Cr-Commit-Position: refs/heads/master@{#350719}
Diffstat (limited to 'jingle')
| -rw-r--r-- | jingle/notifier/base/xmpp_connection.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/jingle/notifier/base/xmpp_connection.h b/jingle/notifier/base/xmpp_connection.h index bc1ec2a..946a6de 100644 --- a/jingle/notifier/base/xmpp_connection.h +++ b/jingle/notifier/base/xmpp_connection.h @@ -22,7 +22,7 @@ class PreXmppAuth; class XmlElement; class XmppClientSettings; class XmppTaskParentInterface; -} // namespace +} // namespace buzz namespace jingle_glue { class TaskPump; @@ -80,6 +80,13 @@ class XmppConnection ~XmppConnection() override; private: + FRIEND_TEST_ALL_PREFIXES(XmppConnectionTest, RaisedError); + FRIEND_TEST_ALL_PREFIXES(XmppConnectionTest, Connect); + FRIEND_TEST_ALL_PREFIXES(XmppConnectionTest, MultipleConnect); + FRIEND_TEST_ALL_PREFIXES(XmppConnectionTest, ConnectThenError); + FRIEND_TEST_ALL_PREFIXES(XmppConnectionTest, + TasksDontRunAfterXmppConnectionDestructor); + void OnStateChange(buzz::XmppEngine::State state); void OnInputLog(const char* data, int len); void OnOutputLog(const char* data, int len); @@ -91,12 +98,6 @@ class XmppConnection bool on_connect_called_; Delegate* delegate_; - FRIEND_TEST(XmppConnectionTest, RaisedError); - FRIEND_TEST(XmppConnectionTest, Connect); - FRIEND_TEST(XmppConnectionTest, MultipleConnect); - FRIEND_TEST(XmppConnectionTest, ConnectThenError); - FRIEND_TEST(XmppConnectionTest, TasksDontRunAfterXmppConnectionDestructor); - DISALLOW_COPY_AND_ASSIGN(XmppConnection); }; |