Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2631)

Unified Diff: chrome/browser/search_engines/template_url_service_unittest.cc

Issue 3341009: Re-enable TemplateURLModel.Load on Linux. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: update to ToT. Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698