summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorapatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-26 21:49:10 +0000
committerapatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-26 21:49:10 +0000
commit04d2c301427de6e7da85546437d286971cff1cff (patch)
treed75fbf2ff896288b153a1c1427a2648ec59ed948 /chrome
parent555707ea60a7cb39d7cc956eb67adffef3a09b60 (diff)
downloadchromium_src-04d2c301427de6e7da85546437d286971cff1cff.zip
chromium_src-04d2c301427de6e7da85546437d286971cff1cff.tar.gz
chromium_src-04d2c301427de6e7da85546437d286971cff1cff.tar.bz2
Implemented NPN_ScheduleTimer and NPN_UnscheduleTimer.
TEST=none BUG=18020 Review URL: http://codereview.chromium.org/329013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30105 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/test/data/npapi/schedule_timer.html25
-rw-r--r--chrome/test/ui/npapi_uitest.cc7
2 files changed, 32 insertions, 0 deletions
diff --git a/chrome/test/data/npapi/schedule_timer.html b/chrome/test/data/npapi/schedule_timer.html
new file mode 100644
index 0000000..2546bb9
--- /dev/null
+++ b/chrome/test/data/npapi/schedule_timer.html
@@ -0,0 +1,25 @@
+<html>
+
+<head>
+<script src="npapi.js"></script>
+</head>
+
+
+<body>
+<div id="statusPanel" style="border: 1px solid red; width: 100%">
+Test running....
+</div>
+
+
+NPAPI NPN_ScheduleTimer test<p>
+Tests that a plugin can schedule and unschedule timers.<P>
+
+<embed type="application/vnd.npapi-test"
+ src="foo"
+ name="schedule_timer"
+ id="1"
+ mode="np_embed"
+>
+
+</body>
+</html>
diff --git a/chrome/test/ui/npapi_uitest.cc b/chrome/test/ui/npapi_uitest.cc
index 4e8b26f..206fdd2 100644
--- a/chrome/test/ui/npapi_uitest.cc
+++ b/chrome/test/ui/npapi_uitest.cc
@@ -293,6 +293,13 @@ TEST_F(NPAPITester, PrivateDisabled) {
kTestCompleteSuccess, kShortWaitTimeout);
}
+TEST_F(NPAPITester, ScheduleTimer) {
+ GURL url = GetTestUrl(L"npapi", L"schedule_timer.html");
+ NavigateToURL(url);
+ WaitForFinish("schedule_timer", "1", url, kTestCompleteCookie,
+ kTestCompleteSuccess, kShortWaitTimeout);
+}
+
// Test checking the privacy mode is on.
TEST_F(NPAPIIncognitoTester, PrivateEnabled) {
if (UITest::in_process_renderer())