2 files changed, 4 insertions, 16 deletions
diff --git a/chrome/browser/extensions/extension_history_api.cc b/chrome/browser/extensions/extension_history_api.cc
index 2016a77..49929bd 100644
--- a/chrome/browser/extensions/extension_history_api.cc
+++ b/chrome/browser/extensions/extension_history_api.cc
@@ -120,12 +120,6 @@ void ExtensionHistoryEventRouter::HistoryUrlVisited(
 
   std::string json_args;
   base::JSONWriter::Write(&args, false, &json_args);
-
-  // Logging to discover if this happens after search on XP in
-  // ExtensionHistoryTest.*.
-  LOG(WARNING) << "ExtensionHistoryEventRouter::HistoryUrlVisited(): "
-               << json_args;
-
   DispatchEvent(profile, keys::kOnVisited, json_args);
 }
 
@@ -146,12 +140,6 @@ void ExtensionHistoryEventRouter::HistoryUrlsRemoved(
 
   std::string json_args;
   base::JSONWriter::Write(&args, false, &json_args);
-
-  // Logging to discover if this happens after search on XP in
-  // ExtensionHistoryTest.*.
-  LOG(WARNING) << "ExtensionHistoryEventRouter::HistoryUrlRemoved(): "
-               << json_args;
-
   DispatchEvent(profile, keys::kOnVisitRemoved, json_args);
 }
 
diff --git a/chrome/browser/extensions/extension_history_apitest.cc b/chrome/browser/extensions/extension_history_apitest.cc
index b27c883..a0b3fbe 100644
--- a/chrome/browser/extensions/extension_history_apitest.cc
+++ b/chrome/browser/extensions/extension_history_apitest.cc
@@ -31,21 +31,21 @@ class ExtensionHistoryApiTest : public ExtensionApiTest {
 };
 
 // Flaky, http://crbug.com/26296.
-IN_PROC_BROWSER_TEST_F(ExtensionHistoryApiTest, MiscSearch) {
+IN_PROC_BROWSER_TEST_F(ExtensionHistoryApiTest, FLAKY_MiscSearch) {
   ASSERT_TRUE(RunExtensionSubtest("history", "misc_search.html")) << message_;
 }
 
 // Flaky, http://crbug.com/26296.
-IN_PROC_BROWSER_TEST_F(ExtensionHistoryApiTest, TimedSearch) {
+IN_PROC_BROWSER_TEST_F(ExtensionHistoryApiTest, FLAKY_TimedSearch) {
   ASSERT_TRUE(RunExtensionSubtest("history", "timed_search.html")) << message_;
 }
 
 // Flaky, http://crbug.com/26296.
-IN_PROC_BROWSER_TEST_F(ExtensionHistoryApiTest, Delete) {
+IN_PROC_BROWSER_TEST_F(ExtensionHistoryApiTest, FLAKY_Delete) {
   ASSERT_TRUE(RunExtensionSubtest("history", "delete.html")) << message_;
 }
 
 // Flaky, http://crbug.com/26296.
-IN_PROC_BROWSER_TEST_F(ExtensionHistoryApiTest, GetVisits) {
+IN_PROC_BROWSER_TEST_F(ExtensionHistoryApiTest, FLAKY_GetVisits) {
   ASSERT_TRUE(RunExtensionSubtest("history", "get_visits.html")) << message_;
 }