Disable flaky BrowsingHistoryHandlerTest.MergeDuplicateResults on Android.

chrome/browser/ui/webui/browsing_history_handler_unittest.cc

Index: chrome/browser/ui/webui/browsing_history_handler_unittest.cc
diff --git a/chrome/browser/ui/webui/browsing_history_handler_unittest.cc b/chrome/browser/ui/webui/browsing_history_handler_unittest.cc
index 11ad576d0c6841f051ab840159fb7007c4d72b2f..f8f6a4b8331533cdfcfd3179575ad0f65efaf456 100644
--- a/chrome/browser/ui/webui/browsing_history_handler_unittest.cc
+++ b/chrome/browser/ui/webui/browsing_history_handler_unittest.cc
@@ -52,7 +52,13 @@ bool ResultEquals(
 
 // 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[] = {