Remove FLAKY marker from some Mac plugin tests

chrome/test/ui/npapi_uitest.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 // windows headers
 #include <comutil.h>
 #include <shellapi.h>
@@ skipping 18 matching lines @@
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/ui/npapi_test_helper.h"
 #include "chrome/test/ui_test_utils.h"
 
 using npapi_test::kTestCompleteCookie;
 using npapi_test::kTestCompleteSuccess;
 
 static const FilePath::CharType* kTestDir = FILE_PATH_LITERAL("npapi");
 
 // Test passing arguments to a plugin.
-#if defined(OS_MACOSX)
-// http://crbug.com/42340 - fails on 10.6 most of the time
-#define MAYBE_Arguments FLAKY_Arguments
-#else
-#define MAYBE_Arguments Arguments
-#endif
-TEST_F(NPAPITester, MAYBE_Arguments) {
+TEST_F(NPAPITester, Arguments) {
   const FilePath test_case(FILE_PATH_LITERAL("arguments.html"));
   GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case);
   ASSERT_NO_FATAL_FAILURE(NavigateToURL(url));
   WaitForFinish("arguments", "1", url, kTestCompleteCookie,
                 kTestCompleteSuccess, action_max_timeout_ms());
 }
 
 // Test invoking many plugins within a single page.
 // Flaky, http://crbug.com/28372
 TEST_F(NPAPITester, FLAKY_ManyPlugins) {
@@ skipping 36 matching lines @@
   const FilePath test_case(FILE_PATH_LITERAL("get_javascript_url2.html"));
   GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case);
   ASSERT_NO_FATAL_FAILURE(NavigateToURL(url));
   WaitForFinish("getjavascripturl2", "1", url, kTestCompleteCookie,
                 kTestCompleteSuccess, action_max_timeout_ms());
 }
 
 // Tests that if an NPObject is proxies back to its original process, the
 // original pointer is returned and not a proxy.  If this fails the plugin
 // will crash.
-#if defined(OS_MACOSX)
-// http://crbug.com/42086 - fails on 10.6 most of the time
-#define MAYBE_NPObjectProxy FLAKY_NPObjectProxy
-#else
-#define MAYBE_NPObjectProxy NPObjectProxy
-#endif
-TEST_F(NPAPITester, MAYBE_NPObjectProxy) {
+TEST_F(NPAPITester, NPObjectProxy) {
   const FilePath test_case(FILE_PATH_LITERAL("npobject_proxy.html"));
   GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case);
   ASSERT_NO_FATAL_FAILURE(NavigateToURL(url));
   WaitForFinish("npobject_proxy", "1", url, kTestCompleteCookie,
                 kTestCompleteSuccess, action_max_timeout_ms());
 }
 
 // Tests if a plugin executing a self deleting script using NPN_GetURL
 // works without crashing or hanging
 TEST_F(NPAPITester, SelfDeletePluginGetUrl) {
@@ skipping 334 matching lines @@
       FilePath(FILE_PATH_LITERAL("npapi/convert_point.html"))));
   ASSERT_NO_FATAL_FAILURE(NavigateToURL(url));
 
   // TODO(stuartmorgan): When the automation system supports sending clicks,
   // change the test to trigger on mouse-down rather than window focus.
   ASSERT_TRUE(browser->BringToFront());
   WaitForFinish("convert_point", "1", url, kTestCompleteCookie,
                 kTestCompleteSuccess, action_max_timeout_ms());
 }
 #endif