Disable flaky BrowsingHistoryHandlerTest.MergeDuplicateResults on Android.

chrome/browser/ui/webui/browsing_history_handler_unittest.cc

 // Copyright (c) 2013 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 "chrome/browser/ui/webui/browsing_history_handler.h"
 
 #include <stdint.h>
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 34 matching lines @@
   base::Time correct_time =
       baseline_time + base::TimeDelta::FromHours(correct_result.hour_offset);
 
   return result.time == correct_time && result.url == GURL(correct_result.url);
 }
 
 }  // namespace
 
 // Tests that the MergeDuplicateResults method correctly removes duplicate
 // visits to the same URL on the same day.
-TEST(BrowsingHistoryHandlerTest, MergeDuplicateResults) {
+// Fails on Android.  http://crbug.com/2345
+#if defined(OS_ANDROID)
+#define MAYBE_MergeDuplicateResults DISABLED_MergeDuplicateResults
+#else
+#define MAYBE_MergeDuplicateResults MergeDuplicateResults
+#endif
+TEST(BrowsingHistoryHandlerTest, MAYBE_MergeDuplicateResults) {
   {
     // Basic test that duplicates on the same day are removed.
     TestResult test_data[] = {
       { "http://google.com", 0 },
       { "http://google.de", 1 },
       { "http://google.com", 2 },
       { "http://google.com", 3 }  // Most recent.
     };
     std::vector<BrowsingHistoryHandler::HistoryEntry> results;
     AddQueryResults(test_data, arraysize(test_data), &results);
@@ skipping 58 matching lines @@
     AddQueryResults(test_data, arraysize(test_data), &results);
     BrowsingHistoryHandler::MergeDuplicateResults(&results);
 
     ASSERT_EQ(2U, results.size());
     EXPECT_TRUE(ResultEquals(results[0], test_data[3]));
     EXPECT_TRUE(ResultEquals(results[1], test_data[1]));
     EXPECT_EQ(3u, results[0].all_timestamps.size());
     EXPECT_EQ(1u, results[1].all_timestamps.size());
   }
 }