Detect & destroy dead conflictresolver paths.

chrome/browser/sync/engine/syncer_unittest.cc

Index: chrome/browser/sync/engine/syncer_unittest.cc
diff --git a/chrome/browser/sync/engine/syncer_unittest.cc b/chrome/browser/sync/engine/syncer_unittest.cc
index 704e5cef787002aa8c99b6f601ef28e360147c14..2c0e5dc385086d14db5a845e4abb6feb4fbdea94 100644
--- a/chrome/browser/sync/engine/syncer_unittest.cc
+++ b/chrome/browser/sync/engine/syncer_unittest.cc
@@ -3728,24 +3728,6 @@ TEST_F(SyncerTest, TestMoveSanitizedNamedFolder) {
   SyncShareAsDelegate();
 }
 
-TEST(SortedCollectionsIntersect, SortedCollectionsIntersectTest) {
-  int negative[] = {-3, -2, -1};
-  int straddle[] = {-1, 0, 1};
-  int positive[] = {1, 2, 3};
-  EXPECT_TRUE(SortedCollectionsIntersect(negative, negative + 3,
-                                         straddle, straddle + 3));
-  EXPECT_FALSE(SortedCollectionsIntersect(negative, negative + 3,
-                                          positive, positive + 3));
-  EXPECT_TRUE(SortedCollectionsIntersect(straddle, straddle + 3,
-                                         positive, positive + 3));
-  EXPECT_FALSE(SortedCollectionsIntersect(straddle + 2, straddle + 3,
-                                          positive, positive));
-  EXPECT_FALSE(SortedCollectionsIntersect(straddle, straddle + 3,
-                                          positive + 1, positive + 1));
-  EXPECT_TRUE(SortedCollectionsIntersect(straddle, straddle + 3,
-                                         positive, positive + 1));
-}
-
 // Don't crash when this occurs.
 TEST_F(SyncerTest, UpdateWhereParentIsNotAFolder) {
   ScopedDirLookup dir(syncdb_.manager(), syncdb_.name());