Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(995)

Unified Diff: ppapi/proxy/ppapi_proxy_test.h

Issue 9034035: Make it possible to have 1 PpapiGlobals per thread. Update unit tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove SHARED; contaminated from another CL Created 8 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ppapi/proxy/ppapi_proxy_test.h
diff --git a/ppapi/proxy/ppapi_proxy_test.h b/ppapi/proxy/ppapi_proxy_test.h
index 2a612ed73a6f81bea858e41d62cd8941ec02ecb4..76de9ee831fcf1a5ee4d56c7ffa86b2d2d819cfd 100644
--- a/ppapi/proxy/ppapi_proxy_test.h
+++ b/ppapi/proxy/ppapi_proxy_test.h
@@ -17,6 +17,8 @@
#include "ppapi/proxy/plugin_proxy_delegate.h"
#include "ppapi/proxy/plugin_resource_tracker.h"
#include "ppapi/proxy/plugin_var_tracker.h"
+#include "ppapi/shared_impl/ppapi_shared_export.h"
+#include "ppapi/shared_impl/test_globals.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace ppapi {
@@ -33,6 +35,7 @@ class ProxyTestHarnessBase {
PP_Instance pp_instance() const { return pp_instance_; }
IPC::TestSink& sink() { return sink_; }
+ virtual PpapiGlobals* GetGlobals() = 0;
// Returns either the plugin or host dispatcher, depending on the test.
virtual Dispatcher* GetDispatcher() = 0;
@@ -88,6 +91,7 @@ class PluginProxyTestHarness : public ProxyTestHarnessBase {
}
// ProxyTestHarnessBase implementation.
+ virtual PpapiGlobals* GetGlobals() { return &plugin_globals_; }
virtual Dispatcher* GetDispatcher();
virtual void SetUpHarness();
virtual void SetUpHarnessWithChannel(const IPC::ChannelHandle& channel_handle,
@@ -139,7 +143,8 @@ class PluginProxyTestHarness : public ProxyTestHarnessBase {
PluginDelegateMock plugin_delegate_mock_;
};
-class PluginProxyTest : public PluginProxyTestHarness, public testing::Test {
+class PPAPI_SHARED_EXPORT PluginProxyTest
+ : public PluginProxyTestHarness, public testing::Test {
public:
PluginProxyTest();
virtual ~PluginProxyTest();
@@ -157,8 +162,15 @@ class HostProxyTestHarness : public ProxyTestHarnessBase {
virtual ~HostProxyTestHarness();
HostDispatcher* host_dispatcher() { return host_dispatcher_.get(); }
+ ResourceTracker& resource_tracker() {
+ return *host_globals_.GetResourceTracker();
+ }
+ VarTracker& var_tracker() {
+ return *host_globals_.GetVarTracker();
+ }
// ProxyTestBase implementation.
+ virtual PpapiGlobals* GetGlobals() { return &host_globals_; }
virtual Dispatcher* GetDispatcher();
virtual void SetUpHarness();
virtual void SetUpHarnessWithChannel(const IPC::ChannelHandle& channel_handle,
@@ -191,11 +203,13 @@ class HostProxyTestHarness : public ProxyTestHarnessBase {
};
private:
+ ppapi::TestGlobals host_globals_;
scoped_ptr<HostDispatcher> host_dispatcher_;
DelegateMock delegate_mock_;
};
-class HostProxyTest : public HostProxyTestHarness, public testing::Test {
+class PPAPI_SHARED_EXPORT HostProxyTest
+ : public HostProxyTestHarness, public testing::Test {
public:
HostProxyTest();
virtual ~HostProxyTest();
@@ -208,7 +222,7 @@ class HostProxyTest : public HostProxyTestHarness, public testing::Test {
};
// Use this base class to test both sides of a proxy.
-class TwoWayTest : public testing::Test {
+class PPAPI_SHARED_EXPORT TwoWayTest : public testing::Test {
public:
enum TwoWayTestMode {
TEST_PPP_INTERFACE,

Powered by Google App Engine
This is Rietveld 408576698