| Index: chrome/browser/search_engines/template_url_service_unittest.cc
|
| diff --git a/chrome/browser/search_engines/template_url_service_unittest.cc b/chrome/browser/search_engines/template_url_service_unittest.cc
|
| index fc1873528048742e478e3ca96f05e2f7f83483d7..e2ffcd83892c3433c2b6687d58a98431ce7323b5 100644
|
| --- a/chrome/browser/search_engines/template_url_service_unittest.cc
|
| +++ b/chrome/browser/search_engines/template_url_service_unittest.cc
|
| @@ -29,13 +29,6 @@
|
| using base::Time;
|
| using base::TimeDelta;
|
|
|
| -#if defined(OS_LINUX)
|
| -// Timed out on Chromium Linux. http://crbug.com/53607
|
| -#define MAYBE_Load DISABLED_Load
|
| -#else
|
| -#define MAYBE_Load Load
|
| -#endif
|
| -
|
| // Test the GenerateSearchURL on a thread or the main thread.
|
| class TestGenerateSearchURL
|
| : public base::RefCountedThreadSafe<TestGenerateSearchURL> {
|
| @@ -378,7 +371,7 @@ void TemplateURLServiceTest::TestLoadUpdatingPreloadedURL(
|
| ASSERT_EQ(prepopulated_url, keyword_url->url()->DisplayURL());
|
| }
|
|
|
| -TEST_F(TemplateURLServiceTest, MAYBE_Load) {
|
| +TEST_F(TemplateURLServiceTest, Load) {
|
| VerifyLoad();
|
| }
|
|
|
|
|