Disable GpuFeatureTest.MultisamplingAllowed on the official bots

This test is broken because it doesn't take into account that this
feature may be disabled by the blacklist (it is disabled pre-10.8.3 on
basically all vendors). It's only not failing on the main waterfall
because those bots have all features disabled, which the test does
actually handle.

TBR=zmo@chromium.org
BUG=314745
NOTRY=True

Review URL: https://codereview.chromium.org/164983004

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

chrome/test/gpu/gpu_feature_browsertest.cc

@@ -296,7 +296,15 @@ IN_PROC_BROWSER_TEST_F(WebGLTest, WebGLDisabled) {
   RunEventTest(url, kWebGLCreationEvent, false);
 }
 
-IN_PROC_BROWSER_TEST_F(GpuFeatureTest, MultisamplingAllowed) {
+#if defined(GOOGLE_CHROME_BUILD) && defined(OS_MACOSX)
+// This test is oblivious to the fact that multisample could be blacklisted on
+// some configurations.
+// http://crbug.com/314745
+#define MAYBE_MultisamplingAllowed DISABLED_MultisamplingAllowed
+#else
+#define MAYBE_MultisamplingAllowed MultisamplingAllowed
+#endif
+IN_PROC_BROWSER_TEST_F(GpuFeatureTest, MAYBE_MultisamplingAllowed) {
   bool expect_blacklisted = false;
   if (gpu::GPUTestBotConfig::GpuBlacklistedOnBot())
     expect_blacklisted = true;