diff options
| -rw-r--r-- | chrome/test/ui/npapi_uitest.cc | 2 | ||||
| -rw-r--r-- | webkit/glue/cpp_bound_class_unittest.cc | 3 | ||||
| -rw-r--r-- | webkit/glue/plugins/test/plugin_windowed_test.cc | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/chrome/test/ui/npapi_uitest.cc b/chrome/test/ui/npapi_uitest.cc index af2cccd..1b90e94 100644 --- a/chrome/test/ui/npapi_uitest.cc +++ b/chrome/test/ui/npapi_uitest.cc @@ -327,7 +327,7 @@ TEST_F(NPAPIVisiblePluginTester, GetURLRequestFailWrite) { #if defined(OS_WIN) // Starting failing during WebKit roll 72952:72986, see http://crbug.com/64874 -TEST_F(NPAPITesterBase, DISABLED_EnsureScriptingWorksInDestroy) { +TEST_F(NPAPITesterBase, EnsureScriptingWorksInDestroy) { if (UITest::in_process_renderer()) return; diff --git a/webkit/glue/cpp_bound_class_unittest.cc b/webkit/glue/cpp_bound_class_unittest.cc index f40b66b..283b807 100644 --- a/webkit/glue/cpp_bound_class_unittest.cc +++ b/webkit/glue/cpp_bound_class_unittest.cc @@ -238,8 +238,7 @@ TEST_F(CppBoundClassTest, InvokeMethods) { "example.echoValue()", "null", // Too few arguments "example.echoType(false)", "true", - // Re-enable after merging r72243. - //"example.echoType(19)", "3.14159", + "example.echoType(19)", "3.14159", "example.echoType(9.876)", "3.14159", "example.echoType('test string')", "'Success!'", "example.echoType()", "null", // Too few arguments diff --git a/webkit/glue/plugins/test/plugin_windowed_test.cc b/webkit/glue/plugins/test/plugin_windowed_test.cc index 2ed3ae6..c82aa55 100644 --- a/webkit/glue/plugins/test/plugin_windowed_test.cc +++ b/webkit/glue/plugins/test/plugin_windowed_test.cc @@ -90,8 +90,8 @@ NPError WindowedPluginTest::Destroy() { bool result = HostFunctions()->evaluate( id(), window_obj, &script_string, &result_var); if (!result || - result_var.type != NPVariantType_Int32 || - result_var.value.intValue != 42) { + result_var.type != NPVariantType_Double || + result_var.value.doubleValue != 42.0) { SetError("Failed to script during NPP_Destroy"); } } |