Disable plugins on the Mac by default until JS plumbing

and drawing works better.
Review URL: http://codereview.chromium.org/115472

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16318 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 16 insertions, 2 deletions

diff --git a/webkit/glue/plugins/plugin_list_mac.mm b/webkit/glue/plugins/plugin_list_mac.mm
index dd09c89..28cf21d 100644
--- a/webkit/glue/plugins/plugin_list_mac.mm
+++ b/webkit/glue/plugins/plugin_list_mac.mm
@@ -68,7 +68,11 @@ void PluginList::LoadPluginsFromDir(const FilePath &path) {
 }
 
 bool PluginList::ShouldLoadPlugin(const WebPluginInfo& info) {
-
+  // TODO(port): uncomment the next line to enable plugins--disabled by
+  // default so that public dev builds fall back correctly to the no-plugin
+  // code on pages with plugins.
+  return false;
+  
   // Hierarchy check
   // (we're loading plugins hierarchically from Library folders, so plugins we
   //  encounter earlier must override plugins we encounter later)
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index b0fbaa0..624ef5c 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -1167,6 +1167,8 @@ BUG10350 LINUX : LayoutTests/fast/replaced/width100percent-radio.html = FAIL
 BUG10666 LINUX : chrome/fast/forms/basic-selects.html = FAIL
 
 // Depends on plugin support.
+BUG10351 MAC : LayoutTests/fast/dom/Window/Plug-ins.html = FAIL
+BUG10351 MAC : LayoutTests/fast/js/navigator-mimeTypes-length.html = FAIL
 BUG10351 MAC : LayoutTests/accessibility/plugin.html = FAIL CRASH
 BUG10351 MAC LINUX : LayoutTests/fast/dom/object-embed-plugin-scripting.html = FAIL
 BUG10351 MAC : LayoutTests/fast/dynamic/flash-replacement-test.html = FAIL CRASH
@@ -1199,7 +1201,7 @@ BUG10351 MAC LINUX : LayoutTests/plugins/netscape-get-property-return-value.html
 BUG10351 MAC LINUX : LayoutTests/plugins/netscape-identifier-conversion.html = FAIL
 BUG10351 MAC LINUX : LayoutTests/plugins/netscape-invoke-default.html = FAIL
 BUG10351 LINUX : LayoutTests/plugins/open-and-close-window-with-plugin.html = FAIL
-BUG10351 LINUX : LayoutTests/plugins/plugin-javascript-access.html = FAIL
+BUG10351 MAC LINUX : LayoutTests/plugins/plugin-javascript-access.html = FAIL
 BUG10351 MAC LINUX : LayoutTests/plugins/plugin-remove-subframe.html = FAIL
 BUG10351 MAC LINUX : LayoutTests/plugins/return-error-from-new-stream-doesnt-invoke-destroy-stream.html = TIMEOUT
 BUG10667 LINUX MAC : chrome/plugins/get-file-url.html = CRASH TIMEOUT
@@ -2652,6 +2654,9 @@ BUG11909 : LayoutTests/http/tests/security/aboutBlank/security-context-grandchil
 
 BUG11924 WIN : LayoutTests/http/tests/navigation/relativeanchor-basic.html = FAIL
 
+BUG11933 LINUX : LayoutTests/fast/frames/content-opacity-1.html = FAIL
+BUG11933 LINUX : LayoutTests/fast/frames/content-opacity-2.html = FAIL
+
 // Need LINUX/Mac rebaselines after WebKit Update 437150:43770
 BUG12054 MAC LINUX : LayoutTests/fast/canvas/canvas-bg-zoom.html = FAIL
 BUG12054 MAC LINUX : LayoutTests/editing/execCommand/outdent-blockquote-test1.html = FAIL
diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp
index d649bc6..f18ce88 100644
--- a/webkit/tools/test_shell/test_shell.gyp
+++ b/webkit/tools/test_shell/test_shell.gyp
@@ -500,6 +500,11 @@
           # mac tests load the resources from the built test_shell beside the
           # test
           'dependencies': ['test_shell'],
+          # TODO(port)
+          # disable plugin tests until we re-enable plugins for chromium.app
+          'sources!': [
+            'plugin_tests.cc',
+          ]
         }],
         ['OS=="win"', {
           'msvs_disabled_warnings': [ 4800 ],