summaryrefslogtreecommitdiffstats
path: root/remoting
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-30 21:49:03 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-30 21:49:03 +0000
commit8822f38cd5d5006033003e5197a56bed2cc33fea (patch)
tree2d239e6b8b1557b1e90c5747b63c56238b2fb846 /remoting
parentc9b9f10acf2d9e8290739b10bfaf18da4ea9656c (diff)
downloadchromium_src-8822f38cd5d5006033003e5197a56bed2cc33fea.zip
chromium_src-8822f38cd5d5006033003e5197a56bed2cc33fea.tar.gz
chromium_src-8822f38cd5d5006033003e5197a56bed2cc33fea.tar.bz2
More FRIEND_TEST_ALL_PREFIXES.
TEST=none BUG=44549 Review URL: http://codereview.chromium.org/3053024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54388 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
-rw-r--r--remoting/client/plugin/chromoting_plugin.h3
-rw-r--r--remoting/host/chromoting_host_context.h4
-rw-r--r--remoting/jingle_glue/iq_request.h4
-rw-r--r--remoting/jingle_glue/jingle_channel.h10
4 files changed, 11 insertions, 10 deletions
diff --git a/remoting/client/plugin/chromoting_plugin.h b/remoting/client/plugin/chromoting_plugin.h
index d613a97..6223c5d 100644
--- a/remoting/client/plugin/chromoting_plugin.h
+++ b/remoting/client/plugin/chromoting_plugin.h
@@ -11,6 +11,7 @@
#include <string>
#include "base/at_exit.h"
+#include "base/gtest_prod_util.h"
#include "base/scoped_ptr.h"
#include "remoting/client/client_context.h"
#include "remoting/client/host_connection.h"
@@ -59,7 +60,7 @@ class ChromotingPlugin : public pp::Instance {
virtual bool CurrentlyOnPluginThread() const;
private:
- FRIEND_TEST(ChromotingPluginTest, TestCaseSetup);
+ FRIEND_TEST_ALL_PREFIXES(ChromotingPluginTest, TestCaseSetup);
// Since we're an internal plugin, we can just grab the message loop during
// init to figure out which thread we're on. This should only be used to
diff --git a/remoting/host/chromoting_host_context.h b/remoting/host/chromoting_host_context.h
index f4e2f8a..1f6b011 100644
--- a/remoting/host/chromoting_host_context.h
+++ b/remoting/host/chromoting_host_context.h
@@ -7,9 +7,9 @@
#include <string>
+#include "base/gtest_prod_util.h"
#include "base/thread.h"
#include "remoting/jingle_glue/jingle_thread.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
namespace remoting {
@@ -29,7 +29,7 @@ class ChromotingHostContext {
virtual MessageLoop* encode_message_loop();
private:
- FRIEND_TEST(ChromotingHostContextTest, StartAndStop);
+ FRIEND_TEST_ALL_PREFIXES(ChromotingHostContextTest, StartAndStop);
// A thread that hosts all network operations.
JingleThread jingle_thread_;
diff --git a/remoting/jingle_glue/iq_request.h b/remoting/jingle_glue/iq_request.h
index e95fa1e..9d6dcad 100644
--- a/remoting/jingle_glue/iq_request.h
+++ b/remoting/jingle_glue/iq_request.h
@@ -8,7 +8,7 @@
#include <string>
#include "base/callback.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
+#include "base/gtest_prod_util.h"
#include "third_party/libjingle/source/talk/xmpp/xmppengine.h"
namespace remoting {
@@ -42,7 +42,7 @@ class IqRequest : private buzz::XmppIqHandler {
}
private:
- FRIEND_TEST(IqRequestTest, MakeIqStanza);
+ FRIEND_TEST_ALL_PREFIXES(IqRequestTest, MakeIqStanza);
// XmppIqHandler interface.
virtual void IqResponse(buzz::XmppIqCookie cookie,
diff --git a/remoting/jingle_glue/jingle_channel.h b/remoting/jingle_glue/jingle_channel.h
index c53119c..0ba1a75 100644
--- a/remoting/jingle_glue/jingle_channel.h
+++ b/remoting/jingle_glue/jingle_channel.h
@@ -10,10 +10,10 @@
#include "base/basictypes.h"
#include "base/condition_variable.h"
+#include "base/gtest_prod_util.h"
#include "base/lock.h"
#include "base/ref_counted.h"
#include "base/scoped_ptr.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
#include "third_party/libjingle/source/talk/base/sigslot.h"
namespace base {
@@ -94,10 +94,10 @@ class JingleChannel : public base::RefCountedThreadSafe<JingleChannel> {
State state_;
private:
- FRIEND_TEST(JingleChannelTest, Init);
- FRIEND_TEST(JingleChannelTest, Write);
- FRIEND_TEST(JingleChannelTest, Read);
- FRIEND_TEST(JingleChannelTest, Close);
+ FRIEND_TEST_ALL_PREFIXES(JingleChannelTest, Init);
+ FRIEND_TEST_ALL_PREFIXES(JingleChannelTest, Write);
+ FRIEND_TEST_ALL_PREFIXES(JingleChannelTest, Read);
+ FRIEND_TEST_ALL_PREFIXES(JingleChannelTest, Close);
typedef std::deque<scoped_refptr<media::DataBuffer> > DataQueue;