Revert 35649 - Make Pepper plugins work on Linux....

webkit/tools/pepper_test_plugin/plugin_object.h

Index: webkit/tools/pepper_test_plugin/plugin_object.h
===================================================================
--- webkit/tools/pepper_test_plugin/plugin_object.h	(revision 35652)
+++ webkit/tools/pepper_test_plugin/plugin_object.h	(working copy)
@@ -27,12 +27,11 @@
 #define WEBKIT_TOOLS_PEPPER_TEST_PLUGIN_PLUGIN_OBJECT_H_
 
 #include "base/basictypes.h"
+#include "base/gfx/size.h"
 #include "base/scoped_ptr.h"
-#include "webkit/glue/plugins/nphostapi.h"
-#if !defined(INDEPENDENT_PLUGIN)
 #include "gpu/command_buffer/client/gles2_implementation.h"
 #include "webkit/tools/pepper_test_plugin/command_buffer_pepper.h"
-#endif
+#include "webkit/glue/plugins/nphostapi.h"
 
 extern NPNetscapeFuncs* browser;
 
@@ -62,14 +61,11 @@
 
   // TODO(apatrick): this destruction order causes the plugin to crash on
   // shutdown.
-#if !defined(INDEPENDENT_PLUGIN)
   scoped_ptr<CommandBufferPepper> command_buffer_;
   scoped_ptr<gpu::gles2::GLES2Implementation> gles2_implementation_;
   scoped_ptr<gpu::gles2::GLES2CmdHelper> helper_;
-#endif
 
-  int width_;
-  int height_;
+  gfx::Size size_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginObject);
 };