Re-enable TemplateURLModel.Load on Linux.

chrome/browser/search_engines/template_url_service_unittest.cc

 // Copyright (c) 2011 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/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_vector.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/threading/thread.h"
@@ skipping 11 matching lines @@
 #include "chrome/test/testing_pref_service.h"
 #include "chrome/test/testing_profile.h"
 #include "content/browser/browser_thread.h"
 #include "content/common/notification_details.h"
 #include "content/common/notification_source.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 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> {
  public:
   explicit TestGenerateSearchURL(SearchTermsData* search_terms_data)
       : search_terms_data_(search_terms_data),
         passed_(false) {
   }
 
   // Run the test cases for GenerateSearchURL.
@@ skipping 322 matching lines @@
   // Wait for any saves to finish.
   BlockTillServiceProcessesRequests();
 
   // Reload the model to verify that change was saved correctly.
   ResetModel(true);
   keyword_url = model()->GetTemplateURLForKeyword(ASCIIToUTF16("unittest"));
   ASSERT_TRUE(keyword_url != NULL);
   ASSERT_EQ(prepopulated_url, keyword_url->url()->DisplayURL());
 }
 
-TEST_F(TemplateURLServiceTest, MAYBE_Load) {
+TEST_F(TemplateURLServiceTest, Load) {
   VerifyLoad();
 }
 
 TEST_F(TemplateURLServiceTest, AddUpdateRemove) {
   // Add a new TemplateURL.
   VerifyLoad();
   const size_t initial_count = model()->GetTemplateURLs().size();
 
   TemplateURL* t_url = new TemplateURL();
   t_url->SetURL("http://www.google.com/foo/bar", 0, 0);
@@ skipping 796 matching lines @@
                                      kEncodings, "");
   VerifyObserverFired();
   EXPECT_TRUE(model()->is_default_search_managed());
   EXPECT_EQ(2 + initial_count, model()->GetTemplateURLs().size());
 
   // Verify that the default manager we are getting is the managed one.
   actual_managed_default = model()->GetDefaultSearchProvider();
   ExpectSimilar(actual_managed_default, expected_managed_default1.get());
   EXPECT_EQ(actual_managed_default->show_in_default_list(), true);
 }