summaryrefslogtreecommitdiffstats
path: root/jingle
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-27 16:40:40 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-27 16:40:40 +0000
commit5a40f6beda09a0f259c7c4b7aa249e26612c5285 (patch)
tree8e1e496b52010d7463a10695ea917110df4fbe20 /jingle
parent3dda5b0f1bb73a437ca6e6f2741580451030ac25 (diff)
downloadchromium_src-5a40f6beda09a0f259c7c4b7aa249e26612c5285.zip
chromium_src-5a40f6beda09a0f259c7c4b7aa249e26612c5285.tar.gz
chromium_src-5a40f6beda09a0f259c7c4b7aa249e26612c5285.tar.bz2
GTTF: more FRIEND_TEST_ALL_PREFIXES
TEST=compile BUG=44549 Review URL: http://codereview.chromium.org/3064007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53793 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle')
-rw-r--r--jingle/notifier/listener/talk_mediator_impl.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/jingle/notifier/listener/talk_mediator_impl.h b/jingle/notifier/listener/talk_mediator_impl.h
index e6fc988..d323faa 100644
--- a/jingle/notifier/listener/talk_mediator_impl.h
+++ b/jingle/notifier/listener/talk_mediator_impl.h
@@ -12,13 +12,13 @@
#include <string>
#include <vector>
+#include "base/gtest_prod_util.h"
#include "base/non_thread_safe.h"
#include "base/scoped_ptr.h"
#include "jingle/notifier/listener/mediator_thread.h"
#include "jingle/notifier/listener/talk_mediator.h"
#include "talk/base/sigslot.h"
#include "talk/xmpp/xmppclientsettings.h"
-#include "testing/gtest/include/gtest/gtest_prod.h" // For FRIEND_TEST
namespace notifier {
@@ -92,10 +92,11 @@ class TalkMediatorImpl
std::vector<std::string> subscribed_services_list_;
- FRIEND_TEST(TalkMediatorImplTest, SetAuthTokenWithBadInput);
- FRIEND_TEST(TalkMediatorImplTest, SetAuthTokenWithGoodInput);
- FRIEND_TEST(TalkMediatorImplTest, SendNotification);
- FRIEND_TEST(TalkMediatorImplTest, MediatorThreadCallbacks);
+ FRIEND_TEST_ALL_PREFIXES(TalkMediatorImplTest, SetAuthTokenWithBadInput);
+ FRIEND_TEST_ALL_PREFIXES(TalkMediatorImplTest, SetAuthTokenWithGoodInput);
+ FRIEND_TEST_ALL_PREFIXES(TalkMediatorImplTest, SendNotification);
+ FRIEND_TEST_ALL_PREFIXES(TalkMediatorImplTest, MediatorThreadCallbacks);
+
DISALLOW_COPY_AND_ASSIGN(TalkMediatorImpl);
};