summaryrefslogtreecommitdiffstats
path: root/remoting
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-16 23:18:46 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-16 23:18:46 +0000
commitf33811ba10a82b0211e5da3abbcd2bd64e3fe6fc (patch)
treea62acd3a45df426f5f2b1855808d6f43be5586c1 /remoting
parentdf17beda0e565c0f72954524d87b85f216e4358c (diff)
downloadchromium_src-f33811ba10a82b0211e5da3abbcd2bd64e3fe6fc.zip
chromium_src-f33811ba10a82b0211e5da3abbcd2bd64e3fe6fc.tar.gz
chromium_src-f33811ba10a82b0211e5da3abbcd2bd64e3fe6fc.tar.bz2
GTTF: some more FRIEND_TEST_ALL_PREFIXES
TEST=none BUG=44549 Review URL: http://codereview.chromium.org/3161021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56253 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
-rw-r--r--remoting/client/plugin/chromoting_instance.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/remoting/client/plugin/chromoting_instance.h b/remoting/client/plugin/chromoting_instance.h
index 4729b96..cea04b4 100644
--- a/remoting/client/plugin/chromoting_instance.h
+++ b/remoting/client/plugin/chromoting_instance.h
@@ -10,10 +10,10 @@
#include <string>
+#include "base/gtest_prod_util.h"
#include "base/scoped_ptr.h"
#include "remoting/client/client_context.h"
#include "remoting/client/host_connection.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
#include "third_party/ppapi/c/pp_event.h"
#include "third_party/ppapi/c/pp_instance.h"
#include "third_party/ppapi/c/pp_rect.h"
@@ -58,7 +58,7 @@ class ChromotingInstance : public pp::Instance {
virtual bool CurrentlyOnPluginThread() const;
private:
- FRIEND_TEST(ChromotingInstanceTest, TestCaseSetup);
+ FRIEND_TEST_ALL_PREFIXES(ChromotingInstanceTest, 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