GTTF: Remove flaky mark from the following tests:

- AccountScreenTest.TestBasic (bug 49004)
- NPAPIVisiblePluginTester.VerifyNPObjectLifetimeTest (bug 34997)
- ChromeFrameTestWithWebServer.WidgetModeFF_CFInstanceSingleton (bug 31532, still one test to be fixed in that bug)
- SavePageBrowserTest.FileNameFromPageTitle (bug 52292)
- FilePathWatcherTest.DisappearingDirectory (bug 54822)
- FilePathWatcherTest.DestroyWithPendingNotification (bug 54822)
- FilePathWatcherTest.WatchDirectory (bug 54822)
- FilePathWatcherTest.Unregister (bug 54822)
- FilePathWatcherTest.DeleteDuringNotify (bug 54822)
- WindowAppleScriptTest.WindowOrder (bug 53584)

TBR=mal

BUG=49004, 34997, 31532, 52292, 54822, 53584
TEST=none

Review URL: http://codereview.chromium.org/3471020

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

6 files changed, 10 insertions, 16 deletions

diff --git a/chrome/browser/chromeos/login/account_screen_browsertest.cc b/chrome/browser/chromeos/login/account_screen_browsertest.cc
index 9997625..f807a37 100644
--- a/chrome/browser/chromeos/login/account_screen_browsertest.cc
+++ b/chrome/browser/chromeos/login/account_screen_browsertest.cc
@@ -41,8 +41,7 @@ class AccountScreenTest : public WizardInProcessBrowserTest {
 // A basic test. It does not care how things evolve after the URL is
 // loaded. Thus no message loop is started. Just check that initial
 // status is expected.
-// This test is flaky. See http://crbug.com/49004 .
-IN_PROC_BROWSER_TEST_F(AccountScreenTest, FLAKY_TestBasic) {
+IN_PROC_BROWSER_TEST_F(AccountScreenTest, TestBasic) {
   ASSERT_TRUE(controller());
   EXPECT_EQ(controller()->GetAccountScreen(), controller()->current_screen());
 }
diff --git a/chrome/browser/cocoa/applescript/window_applescript_test.mm b/chrome/browser/cocoa/applescript/window_applescript_test.mm
index 9893817..6d0a9d3 100644
--- a/chrome/browser/cocoa/applescript/window_applescript_test.mm
+++ b/chrome/browser/cocoa/applescript/window_applescript_test.mm
@@ -167,8 +167,7 @@ IN_PROC_BROWSER_TEST_F(WindowAppleScriptTest, ActiveTab) {
 }
 
 // Order of windows.
-// Failing on Chromium Mac: http://crbug/53584
-IN_PROC_BROWSER_TEST_F(WindowAppleScriptTest, FLAKY_WindowOrder) {
+IN_PROC_BROWSER_TEST_F(WindowAppleScriptTest, WindowOrder) {
   scoped_nsobject<WindowAppleScript> window2(
       [[WindowAppleScript alloc] initWithBrowser:browser()]);
   scoped_nsobject<WindowAppleScript> window1(
diff --git a/chrome/browser/download/save_page_browsertest.cc b/chrome/browser/download/save_page_browsertest.cc
index 52a45d6..512aaaa 100644
--- a/chrome/browser/download/save_page_browsertest.cc
+++ b/chrome/browser/download/save_page_browsertest.cc
@@ -146,8 +146,7 @@ IN_PROC_BROWSER_TEST_F(SavePageBrowserTest, NoSave) {
   EXPECT_FALSE(browser()->command_updater()->IsCommandEnabled(IDC_SAVE_PAGE));
 }
 
-// See http://crbug.com/52292
-IN_PROC_BROWSER_TEST_F(SavePageBrowserTest, FLAKY_FileNameFromPageTitle) {
+IN_PROC_BROWSER_TEST_F(SavePageBrowserTest, FileNameFromPageTitle) {
   FilePath file_name(FILE_PATH_LITERAL("b.htm"));
 
   GURL url = URLRequestMockHTTPJob::GetMockUrl(
diff --git a/chrome/browser/file_path_watcher_unittest.cc b/chrome/browser/file_path_watcher_unittest.cc
index cea627e..8099c2d 100644
--- a/chrome/browser/file_path_watcher_unittest.cc
+++ b/chrome/browser/file_path_watcher_unittest.cc
@@ -224,7 +224,7 @@ TEST_F(FilePathWatcherTest, MAYBE(DeletedFile)) {
 }
 
 // Verify that letting the watcher go out of scope stops notifications.
-TEST_F(FilePathWatcherTest, MAYBE(Unregister)) {
+TEST_F(FilePathWatcherTest, Unregister) {
   scoped_refptr<TestDelegate> delegate(new TestDelegate);
 
   {
@@ -260,7 +260,7 @@ class Deleter : public FilePathWatcher::Delegate {
 }  // anonymous namespace
 
 // Verify that deleting a watcher during the callback doesn't crash.
-TEST_F(FilePathWatcherTest, MAYBE(DeleteDuringNotify)) {
+TEST_F(FilePathWatcherTest, DeleteDuringNotify) {
   FilePathWatcher* watcher = new FilePathWatcher;
   // Takes ownership of watcher.
   scoped_refptr<Deleter> deleter(new Deleter(watcher, &loop_));
@@ -276,7 +276,7 @@ TEST_F(FilePathWatcherTest, MAYBE(DeleteDuringNotify)) {
 
 // Verify that deleting the watcher works even if there is a pending
 // notification.
-TEST_F(FilePathWatcherTest, MAYBE(DestroyWithPendingNotification)) {
+TEST_F(FilePathWatcherTest, DestroyWithPendingNotification) {
   scoped_refptr<TestDelegate> delegate(new TestDelegate);
   FilePathWatcher* watcher = new FilePathWatcher;
   SetupWatch(test_file(), watcher, delegate.get());
@@ -349,7 +349,7 @@ TEST_F(FilePathWatcherTest, MAYBE(DirectoryChain)) {
   EXPECT_LE(1, WaitForEvents(delegate.get()));
 }
 
-TEST_F(FilePathWatcherTest, MAYBE(DisappearingDirectory)) {
+TEST_F(FilePathWatcherTest, DisappearingDirectory) {
   FilePathWatcher watcher;
   FilePath dir(temp_dir_->path().AppendASCII("dir"));
   FilePath file(dir.AppendASCII("file"));
@@ -382,7 +382,7 @@ TEST_F(FilePathWatcherTest, MAYBE(DeleteAndRecreate)) {
   EXPECT_LE(1, WaitForEvents(delegate.get()));
 }
 
-TEST_F(FilePathWatcherTest, MAYBE(WatchDirectory)) {
+TEST_F(FilePathWatcherTest, WatchDirectory) {
   FilePathWatcher watcher;
   FilePath dir(temp_dir_->path().AppendASCII("dir"));
   FilePath file1(dir.AppendASCII("file1"));
diff --git a/chrome/test/ui/npapi_uitest.cc b/chrome/test/ui/npapi_uitest.cc
index 5803e62..fe074e0 100644
--- a/chrome/test/ui/npapi_uitest.cc
+++ b/chrome/test/ui/npapi_uitest.cc
@@ -184,8 +184,7 @@ TEST_F(NPAPIVisiblePluginTester, AlertInWindowMessage) {
       MessageBoxFlags::DIALOGBUTTON_OK));
 }
 
-// Flaky, http://crbug.com/34997.
-TEST_F(NPAPIVisiblePluginTester, FLAKY_VerifyNPObjectLifetimeTest) {
+TEST_F(NPAPIVisiblePluginTester, VerifyNPObjectLifetimeTest) {
   if (UITest::in_process_renderer())
     return;
 
diff --git a/chrome_frame/test/test_with_web_server.cc b/chrome_frame/test/test_with_web_server.cc
index 9af2a72..2b433d2 100644
--- a/chrome_frame/test/test_with_web_server.cc
+++ b/chrome_frame/test/test_with_web_server.cc
@@ -524,9 +524,7 @@ TEST_F(ChromeFrameTestWithWebServer, WidgetModeIE_CFInstanceSingleton) {
   SimpleBrowserTest(IE, kCFISingletonPage);
 }
 
-// This test randomly fails on the ChromeFrame builder.
-// Bug http://code.google.com/p/chromium/issues/detail?id=31532
-TEST_F(ChromeFrameTestWithWebServer, FLAKY_WidgetModeFF_CFInstanceSingleton) {
+TEST_F(ChromeFrameTestWithWebServer, WidgetModeFF_CFInstanceSingleton) {
   SimpleBrowserTest(FIREFOX, kCFISingletonPage);
 }