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

Unified Diff: ppapi/shared_impl/test_globals.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: Fix test. Cleanup. Move proxy lock to globals. 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/shared_impl/test_globals.h
diff --git a/ppapi/shared_impl/test_globals.h b/ppapi/shared_impl/test_globals.h
index 9c58fd3f4707d9b26ebce08b54178df8084029af..56a5284ac5e56662f5b5aa7647935857922490db 100644
--- a/ppapi/shared_impl/test_globals.h
+++ b/ppapi/shared_impl/test_globals.h
@@ -8,12 +8,13 @@
#include "base/compiler_specific.h"
#include "ppapi/shared_impl/callback_tracker.h"
#include "ppapi/shared_impl/ppapi_globals.h"
+#include "ppapi/shared_impl/ppapi_shared_export.h"
#include "ppapi/shared_impl/resource_tracker.h"
#include "ppapi/shared_impl/var_tracker.h"
namespace ppapi {
-class TestVarTracker : public VarTracker {
+class PPAPI_SHARED_EXPORT TestVarTracker : public VarTracker {
public:
TestVarTracker() {}
virtual ~TestVarTracker() {}
@@ -24,9 +25,10 @@ class TestVarTracker : public VarTracker {
// Implementation of PpapiGlobals for tests that don't need either the host- or
// plugin-specific implementations.
-class TestGlobals : public PpapiGlobals {
+class PPAPI_SHARED_EXPORT TestGlobals : public PpapiGlobals {
public:
TestGlobals();
+ TestGlobals(PpapiGlobals::ForTest);
virtual ~TestGlobals();
// PpapiGlobals implementation.
@@ -37,6 +39,7 @@ class TestGlobals : public PpapiGlobals {
virtual FunctionGroupBase* GetFunctionAPI(PP_Instance inst,
ApiID id) OVERRIDE;
virtual PP_Module GetModuleForInstance(PP_Instance instance) OVERRIDE;
+ virtual base::Lock* GetProxyLock() OVERRIDE;
private:
ResourceTracker resource_tracker_;

Powered by Google App Engine
This is Rietveld 408576698