Rollback 11498...

chrome/test/plugin/plugin_test.cpp

 // Copyright 2008, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //    * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //    * Redistributions in binary form must reproduce the above
@@ skipping 142 matching lines @@
 }
 
 TEST_F(PluginTest, FlashOctetStream) {
   TestPlugin(L"flash-octet-stream.html", kShortWaitTimeout);
 }
 
 TEST_F(PluginTest, FlashSecurity) {
   TestPlugin(L"flash.html", kShortWaitTimeout);
 }
 
-// http://crbug.com/8690
-TEST_F(PluginTest, DISABLED_Java) {
+TEST_F(PluginTest, Java) {
   TestPlugin(L"Java.html", kShortWaitTimeout);
 }
 
 TEST_F(PluginTest, Silverlight) {
   TestPlugin(L"silverlight.html", kShortWaitTimeout);
 }
 
 typedef HRESULT (__stdcall* DllRegUnregServerFunc)();
 
 class ActiveXTest : public PluginTest {
@@ skipping 40 matching lines @@
 }
 
 TEST_F(ActiveXTest, WMP) {
   TestActiveX(L"activex_wmp.html", kLongWaitTimeout, false);
 }
 
 TEST_F(ActiveXTest, CustomScripting) {
   TestActiveX(L"activex_custom_scripting.html", kShortWaitTimeout, true);
 }