summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-31 23:28:21 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-31 23:28:21 +0000
commit8922de5133af29b6d89830f5df893b3eccf3c7c1 (patch)
tree063c92f565397698513d028dd657a0f868a355e8 /chrome/test
parent930d36bc6e6b640384de59a877ce1351fddc2fe2 (diff)
downloadchromium_src-8922de5133af29b6d89830f5df893b3eccf3c7c1.zip
chromium_src-8922de5133af29b6d89830f5df893b3eccf3c7c1.tar.gz
chromium_src-8922de5133af29b6d89830f5df893b3eccf3c7c1.tar.bz2
This fixes bug http://code.google.com/p/chromium/issues/detail?id=3881, which
was NPAPI plugin UI test failures. This occured as a sideeffect of the webkit merge. Some functions in widget.h which were implemented by WebPluginContainer no longer exist. We need to implement their replacements on similar lines. Bug=3881 R=jam Review URL: http://codereview.chromium.org/8775 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4343 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/ui/npapi_uitest.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/test/ui/npapi_uitest.cpp b/chrome/test/ui/npapi_uitest.cpp
index ab1fed5..2657220 100644
--- a/chrome/test/ui/npapi_uitest.cpp
+++ b/chrome/test/ui/npapi_uitest.cpp
@@ -77,7 +77,7 @@ TEST_F(NPAPITester, Arguments) {
// Test invoking many plugins within a single page.
-TEST_F(NPAPITester, DISABLED_ManyPlugins) {
+TEST_F(NPAPITester, ManyPlugins) {
std::wstring test_case = L"many_plugins.html";
GURL url(GetTestUrl(L"npapi", test_case));
NavigateToURL(url);
@@ -203,7 +203,7 @@ TEST_F(NPAPIVisiblePluginTester, VerifyPluginWindowRect) {
kTestCompleteSuccess, kShortWaitTimeout);
}
-TEST_F(NPAPIVisiblePluginTester, DISABLED_VerifyNPObjectLifetimeTest) {
+TEST_F(NPAPIVisiblePluginTester, VerifyNPObjectLifetimeTest) {
if (!UITest::in_process_plugins() && !UITest::in_process_renderer()) {
show_window_ = true;
std::wstring test_case = L"npobject_lifetime_test.html";