Index: ppapi/tests/test_flash_fullscreen.cc |
=================================================================== |
--- ppapi/tests/test_flash_fullscreen.cc (revision 101850) |
+++ ppapi/tests/test_flash_fullscreen.cc (working copy) |
@@ -2,25 +2,25 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "ppapi/tests/test_fullscreen.h" |
+#include "ppapi/tests/test_flash_fullscreen.h" |
#include <stdio.h> |
#include <string.h> |
#include <string> |
#include "ppapi/c/dev/ppb_testing_dev.h" |
-#include "ppapi/c/dev/ppb_fullscreen_dev.h" |
-#include "ppapi/cpp/dev/fullscreen_dev.h" |
+#include "ppapi/c/private/ppb_flash_fullscreen.h" |
#include "ppapi/cpp/graphics_2d.h" |
#include "ppapi/cpp/instance.h" |
#include "ppapi/cpp/module.h" |
#include "ppapi/cpp/point.h" |
+#include "ppapi/cpp/private/flash_fullscreen.h" |
#include "ppapi/cpp/rect.h" |
#include "ppapi/cpp/size.h" |
#include "ppapi/tests/test_utils.h" |
#include "ppapi/tests/testing_instance.h" |
-REGISTER_TEST_CASE(Fullscreen); |
+REGISTER_TEST_CASE(FlashFullscreen); |
namespace { |
@@ -35,7 +35,7 @@ |
} // namespace |
-TestFullscreen::TestFullscreen(TestingInstance* instance) |
+TestFlashFullscreen::TestFlashFullscreen(TestingInstance* instance) |
: TestCase(instance), |
screen_mode_(instance), |
fullscreen_pending_(false), |
@@ -45,16 +45,16 @@ |
screen_mode_.GetScreenSize(&screen_size_); |
} |
-bool TestFullscreen::Init() { |
+bool TestFlashFullscreen::Init() { |
return InitTestingInterface(); |
} |
-void TestFullscreen::RunTest() { |
+void TestFlashFullscreen::RunTest() { |
RUN_TEST(GetScreenSize); |
RUN_TEST(NormalToFullscreenToNormal); |
} |
-std::string TestFullscreen::TestGetScreenSize() { |
+std::string TestFlashFullscreen::TestGetScreenSize() { |
if (screen_size_.width() < 320 || screen_size_.width() > 2560) |
return ReportError("screen_size.width()", screen_size_.width()); |
if (screen_size_.height() < 200 || screen_size_.height() > 2048) |
@@ -62,7 +62,7 @@ |
PASS(); |
} |
-std::string TestFullscreen::TestNormalToFullscreenToNormal() { |
+std::string TestFlashFullscreen::TestNormalToFullscreenToNormal() { |
// 0. Start in normal mode. |
if (screen_mode_.IsFullscreen()) |
return ReportError("IsFullscreen() at start", true); |
@@ -131,7 +131,7 @@ |
// Transition to fullscreen is asynchornous ending at DidChangeView. |
// Transition to normal is synchronous in-process and asynchronous |
// out-of-process ending at DidChangeView. |
-void TestFullscreen::DidChangeView(const pp::Rect& position, |
+void TestFlashFullscreen::DidChangeView(const pp::Rect& position, |
const pp::Rect& clip) { |
if (fullscreen_pending_ && IsFullscreenView(position, clip, screen_size_)) { |
fullscreen_pending_ = false; |