Revert of Re-enable some HistoryApiTests

chrome/browser/extensions/api/history/history_apitest.cc

 // Copyright (c) 2012 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/base_switches.h"
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
@@ skipping 16 matching lines @@
   ASSERT_TRUE(StartEmbeddedTestServer());
   ASSERT_TRUE(RunExtensionSubtest("history", "misc_search.html")) << message_;
 }
 
 // Same could happen here without the FTS (http://crbug/119505)
 IN_PROC_BROWSER_TEST_F(HistoryApiTest, DISABLED_TimedSearch) {
   ASSERT_TRUE(StartEmbeddedTestServer());
   ASSERT_TRUE(RunExtensionSubtest("history", "timed_search.html")) << message_;
 }
 
-IN_PROC_BROWSER_TEST_F(HistoryApiTest, Delete) {
+#if defined(OS_WIN)
+// Flaky on Windows: crbug.com/88318
+#define MAYBE_Delete DISABLED_Delete
+#else
+#define MAYBE_Delete Delete
+#endif
+IN_PROC_BROWSER_TEST_F(HistoryApiTest, MAYBE_Delete) {
   ASSERT_TRUE(StartEmbeddedTestServer());
   ASSERT_TRUE(RunExtensionSubtest("history", "delete.html")) << message_;
 }
 
 IN_PROC_BROWSER_TEST_F(HistoryApiTest, DeleteProhibited) {
   browser()->profile()->GetPrefs()->
       SetBoolean(prefs::kAllowDeletingBrowserHistory, false);
   ASSERT_TRUE(StartEmbeddedTestServer());
   ASSERT_TRUE(RunExtensionSubtest("history", "delete_prohibited.html")) <<
       message_;
 }
 
-IN_PROC_BROWSER_TEST_F(HistoryApiTest, GetVisits) {
+// See crbug.com/79074
+IN_PROC_BROWSER_TEST_F(HistoryApiTest, DISABLED_GetVisits) {
   ASSERT_TRUE(StartEmbeddedTestServer());
   ASSERT_TRUE(RunExtensionSubtest("history", "get_visits.html")) << message_;
 }
 
-IN_PROC_BROWSER_TEST_F(HistoryApiTest, SearchAfterAdd) {
+#if defined(OS_WIN)
+// Searching for a URL right after adding it fails on win XP.
+// Fix this as part of crbug/76170.
+#define MAYBE_SearchAfterAdd DISABLED_SearchAfterAdd
+#else
+#define MAYBE_SearchAfterAdd SearchAfterAdd
+#endif
+
+IN_PROC_BROWSER_TEST_F(HistoryApiTest, MAYBE_SearchAfterAdd) {
   ASSERT_TRUE(StartEmbeddedTestServer());
   ASSERT_TRUE(RunExtensionSubtest("history", "search_after_add.html"))
       << message_;
 }
 
 }  // namespace extensions