Revert 114881 - PPB_Fullscreen test: Merge the NaCl version of the test into ppapi/tests compiled with gyp.

The two tests were written at around the same time and using the same test cases, 
so the only piece missing was the binding and paintig of the graphics device.

BUG=none
TEST=ui_tests
Review URL: http://codereview.chromium.org/8954008

TBR=polina@google.com
Review URL: http://codereview.chromium.org/8976016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114889 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 8 deletions

diff --git a/ppapi/tests/test_fullscreen.h b/ppapi/tests/test_fullscreen.h
index a022f75..f326bc9 100644
--- a/ppapi/tests/test_fullscreen.h
+++ b/ppapi/tests/test_fullscreen.h
@@ -7,7 +7,6 @@
 
 #include <string>
 
-#include "base/logging.h"
 #include "ppapi/cpp/fullscreen.h"
 #include "ppapi/cpp/graphics_2d.h"
 #include "ppapi/cpp/rect.h"
@@ -19,8 +18,6 @@ namespace pp {
 class InputEvent;
 }  // namespace pp
 
-struct ColorPremul { uint32_t A, R, G, B; };  // Use premultipled Alpha.
-
 class TestFullscreen : public TestCase {
  public:
   explicit TestFullscreen(TestingInstance* instance);
@@ -36,11 +33,8 @@ class TestFullscreen : public TestCase {
   std::string TestNormalToFullscreenToNormal();
 
   void SimulateUserGesture();
+
   void FailFullscreenTest(const std::string& error);
-  void FailNormalTest(const std::string& error);
-  void PassFullscreenTest();
-  void PassNormalTest();
-  bool PaintPlugin(pp::Size size, ColorPremul color);
 
   bool GotError();
   std::string Error();
@@ -54,7 +48,8 @@ class TestFullscreen : public TestCase {
   bool fullscreen_pending_;
   bool normal_pending_;
   bool saw_first_fullscreen_didchangeview;
-  pp::Graphics2D graphics2d_;
+  pp::Graphics2D graphics2d_fullscreen_;
+  pp::Graphics2D graphics2d_normal_;
   TestCompletionCallback set_fullscreen_true_callback_;
   TestCompletionCallback fullscreen_callback_;
   TestCompletionCallback normal_callback_;