Update a bunch of FLAKY_ tests to match current reality

chrome/test/startup/startup_test.cc

 // Copyright (c) 2010 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 "base/environment.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/platform_thread.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
@@ skipping 279 matching lines @@
 
 TEST_F(StartupTest, PerfFewTabs) {
   RunPerfTestWithManyTabs("few_tabs", "cmdline", 5, 2, false);
 }
 
 TEST_F(StartupTest, PerfFewTabsReference) {
   UseReferenceBuild();
   RunPerfTestWithManyTabs("few_tabs", "cmdline-ref", 5, 2, false);
 }
 
-// http://crbug.com/52858
-#if defined(OS_MACOSX)
-#define MAYBE_PerfRestoreFewTabs FLAKY_PerfRestoreFewTabs
-#else
-#define MAYBE_PerfRestoreFewTabs PerfRestoreFewTabs
-#endif
-TEST_F(StartupTest, MAYBE_PerfRestoreFewTabs) {
+TEST_F(StartupTest, PerfRestoreFewTabs) {
   RunPerfTestWithManyTabs("few_tabs", "restore", 5, 2, true);
 }
 
 TEST_F(StartupTest, PerfRestoreFewTabsReference) {
   UseReferenceBuild();
   RunPerfTestWithManyTabs("few_tabs", "restore-ref", 5, 2, true);
 }
 
 #if defined(OS_MACOSX)
 // http://crbug.com/46609
@@ skipping 79 matching lines @@
                  UITest::CUSTOM_FRAME, 0, 0);
 }
 
 TEST_F(StartupTest, PerfNativeFrameGtkTheme) {
   RunStartupTest("warm", "custom-frame-gtk-theme", WARM, NOT_IMPORTANT,
                  UITest::CUSTOM_FRAME_NATIVE_THEME, 0, 0);
 }
 #endif
 
 }  // namespace