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

Unified Diff: content/renderer/pepper/ppapi_unittest.h

Issue 21966004: Pepper: Move FileRef to the "new" resource proxy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix bug in GetAbsolutePath (fixes FlashDRM test failure) Created 7 years, 4 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: content/renderer/pepper/ppapi_unittest.h
diff --git a/content/renderer/pepper/ppapi_unittest.h b/content/renderer/pepper/ppapi_unittest.h
index 4bca4e97cef75731328748bd3d93c4b894a0cc07..be01e333030f27acf5267c0650c480cdc982722c 100644
--- a/content/renderer/pepper/ppapi_unittest.h
+++ b/content/renderer/pepper/ppapi_unittest.h
@@ -8,6 +8,7 @@
#include "base/basictypes.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
+#include "content/renderer/pepper/unittest_instance_util.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace base {
@@ -27,23 +28,15 @@ class PpapiUnittest : public testing::Test {
virtual void SetUp();
virtual void TearDown();
- PluginModule* module() const { return module_.get(); }
- PepperPluginInstanceImpl* instance() const { return instance_.get(); }
-
- // Provides access to the interfaces implemented by the test. The default one
- // implements PPP_INSTANCE.
- virtual const void* GetMockInterface(const char* interface_name) const;
-
- // Deletes the instance and module to simulate module shutdown.
- void ShutdownModule();
-
- // Sets the view size of the plugin instance.
- void SetViewSize(int width, int height) const;
+ PluginModule* module() const { return instance_util_.module(); }
+ PepperPluginInstanceImpl* instance() const {
+ return instance_util_.instance();
+ }
private:
- // Note: module must be declared first since we want it to get destroyed last.
- scoped_refptr<PluginModule> module_;
- scoped_refptr<PepperPluginInstanceImpl> instance_;
+ // Note: instance_util_ must be declared first since we want it to get
+ // destroyed last.
+ UnittestInstanceUtil instance_util_;
scoped_ptr<base::MessageLoop> message_loop_;

Powered by Google App Engine
This is Rietveld 408576698