Use FRIEND_TEST_ALL_PREFIXES instead of FRIEND_TEST.

jingle/notifier/base/xmpp_connection.h

Index: jingle/notifier/base/xmpp_connection.h
diff --git a/jingle/notifier/base/xmpp_connection.h b/jingle/notifier/base/xmpp_connection.h
index bc1ec2a1e48cd5191e30109236a4ab77e8d8dc29..5d484a01f6d2d5a8a1c120dfcdd158fc1e47107c 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
+}

[Nicolas Zea, 2015/09/24 21:36:35]

nit: // namespace buzz?

[Lei Zhang, 2015/09/24 21:37:55]

Sure. I'm meh about the closing comment when it's only a few lines.

 
 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);
 };