Revert "Mark tests FLAKY: HomePageLink and NTPHasThumbnails"

chrome/browser/dom_ui/new_tab_ui_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 "chrome/test/ui/ui_test.h"
 
 #include "base/file_path.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/dom_ui/new_tab_ui.h"
@@ skipping 12 matching lines @@
     // Set home page to the empty string so that we can set the home page using
     // preferences.
     homepage_ = L"";
 
     // Setup the DEFAULT_THEME profile (has fake history entries).
     set_template_user_data(UITest::ComputeTypicalUserDataSource(
         UITest::DEFAULT_THEME));
   }
 };
 
-// Failing about 90% on XP. http://crbug.com/49389
-TEST_F(NewTabUITest, FLAKY_NTPHasThumbnails) {
+TEST_F(NewTabUITest, NTPHasThumbnails) {
   // Switch to the "new tab" tab, which should be any new tab after the
   // first (the first is about:blank).
   scoped_refptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(window.get());
 
   // Bring up a new tab page.
   ASSERT_TRUE(window->RunCommand(IDC_NEW_TAB));
   int load_time;
   ASSERT_TRUE(automation()->WaitForInitialNewTabUILoad(&load_time));
 
@@ skipping 47 matching lines @@
 
   bool migrated = NewTabUI::UpdateUserPrefsVersion(prefs.get());
   ASSERT_TRUE(migrated);
   ASSERT_EQ(NewTabUI::current_pref_version(),
             prefs->GetInteger(prefs::kNTPPrefVersion));
 
   migrated = NewTabUI::UpdateUserPrefsVersion(prefs.get());
   ASSERT_FALSE(migrated);
 }
 
-// Failing about 90% on XP. http://crbug.com/49389
-TEST_F(NewTabUITest, FLAKY_HomePageLink) {
+TEST_F(NewTabUITest, HomePageLink) {
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get());
 
   ASSERT_TRUE(
       browser->SetBooleanPreference(prefs::kHomePageIsNewTabPage, false));
 
   // Bring up a new tab page.
   ASSERT_TRUE(browser->RunCommand(IDC_NEW_TAB));
   int load_time;
   ASSERT_TRUE(automation()->WaitForInitialNewTabUILoad(&load_time));
@@ skipping 45 matching lines @@
     L"})()"
     L")",
     &has_class));
   ASSERT_TRUE(has_class);
 
   bool is_home_page;
   ASSERT_TRUE(browser->GetBooleanPreference(prefs::kHomePageIsNewTabPage,
               &is_home_page));
   ASSERT_TRUE(is_home_page);
 }