1
   2
   3
   4
   5
   6
   7
   8
   9
  10
  11
  12
  13
  14
  15
  16
  17
  18
  19
  20
  21
  22
  23
  24
  25
  26
  27
  28
  29
  30
  31
  32
  33
  34
  35
  36
  37
  38
  39
  40
  41
  42
  43
  44
  45
  46
  47
  48
  49
  50
  51
  52
  53
  54
  55
  56
  57
  58
  59
  60
  61
  62
  63
  64
  65
  66
  67
  68
  69
  70
  71
  72
  73
  74
  75
  76
  77
  78
  79
  80
  81
  82
  83
  84
  85
  86
  87
  88
  89
  90
  91
  92
  93
  94
  95
  96
  97
  98
  99
 100
 101
 102
 103
 104
 105
 106
 107
 108
 109
 110
 111
 112
 113
 114
 115
 116
 117
 118
 119
 120
 121
 122
 123
 124
 125
 126
 127
 128
 129
 130
 131
 132
 133
 134
 135
 136
 137
 138
 139
 140
 141
 142
 143
 144
 145
 146
 147
 148
 149
 150
 151
 152
 153
 154
 155
 156
 157
 158
 159
 160
 161
 162
 163
 164
 165
 166
 167
 168
 169
 170
 171
 172
 173
 174
 175
 176
 177
 178
 179
 180
 181
 182
 183
 184
 185
 186
 187
 188
 189
 190
 191
 192
 193
 194
 195
 196
 197
 198
 199
 200
 201
 202
 203
 204
 205
 206
 207
 208
 209
 210
 211
 212
 213
 214
 215
 216
 217
 218
 219
 220
 221
 222
 223
 224
 225
 226
 227
 228
 229
 230
 231
 232
 233
 234
 235
 236
 237
 238
 239
 240
 241
 242
 243
 244
 245
 246
 247
 248
 249
 250
 251
 252
 253
 254
 255
 256
 257
 258
 259
 260
 261
 262
 263
 264
 265
 266
 267
 268
 269
 270
 271
 272
 273
 274
 275
 276
 277
 278
 279
 280
 281
 282
 283
 284
 285
 286
 287
 288
 289
 290
 291
 292
 293
 294
 295
 296
 297
 298
 299
 300
 301
 302
 303
 304
 305
 306
 307
 308
 309
 310
 311
 312
 313
 314
 315
 316
 317
 318
 319
 320
 321
 322
 323
 324
 325
 326
 327
 328
 329
 330
 331
 332
 333
 334
 335
 336
 337
 338
 339
 340
 341
 342
 343
 344
 345
 346
 347
 348
 349
 350
 351
 352
 353
 354
 355
 356
 357
 358
 359
 360
 361
 362
 363
 364
 365
 366
 367
 368
 369
 370
 371
 372
 373
 374
 375
 376
 377
 378
 379
 380
 381
 382
 383
 384
 385
 386
 387
 388
 389
 390
 391
 392
 393
 394
 395
 396
 397
 398
 399
 400
 401
 402
 403
 404
 405
 406
 407
 408
 409
 410
 411
 412
 413
 414
 415
 416
 417
 418
 419
 420
 421
 422
 423
 424
 425
 426
 427
 428
 429
 430
 431
 432
 433
 434
 435
 436
 437
 438
 439
 440
 441
 442
 443
 444
 445
 446
 447
 448
 449
 450
 451
 452
 453
 454
 455
 456
 457
 458
 459
 460
 461
 462
 463
 464
 465
 466
 467
 468
 469
 470
 471
 472
 473
 474
 475
 476
 477
 478
 479
 480
 481
 482
 483
 484
 485
 486
 487
 488
 489
 490
 491
 492
 493
 494
 495
 496
 497
 498
 499
 500
 501
 502
 503
 504
 505
 506
 507
 508
 509
 510
 511
 512
 513
 514
 515
 516
 517
 518
 519
 520
 521
 522
 523
 524
 525
 526
 527
 528
 529
 530
 531
 532
 533
 534
 535
 536
 537
 538
 539
 540
 541
 542
 543
 544
 545
 546
 547
 548
 549
 550
 551
 552
 553
 554
 555
 556
 557
 558
 559
 560
 561
 562
 563
 564
 565
 566
 567
 568
 569
 570
 571
 572
 573
 574
 575
 576
 577
 578
 579
 580
 581
 582
 583
 584
 585
 586
 587
 588
 589
 590
 591
 592
 593
 594
 595
 596
 597
 598
 599
 600
 601
 602
 603
 604
 605
 606
 607
 608
 609
 610
 611
 612
 613
 614
 615
 616
 617
 618
 619
 620
 621
 622
 623
 624
 625
 626
 627
 628
 629
 630
 631
 632
 633
 634
 635
 636
 637
 638
 639
 640
 641
 642
 643
 644
 645
 646
 647
 648
 649
 650
 651
 652
 653
 654
 655
 656
 657
 658
 659
 660
 661
 662
 663
 664
 665
 666
 667
 668
 669
 670
 671
 672
 673
 674
 675
 676
 677
 678
 679
 680
 681
 682
 683
 684
 685
 686
 687
 688
 689
 690
 691
 692
 693
 694
 695
 696
 697
 698
 699
 700
 701
 702
 703
 704
 705
 706
 707
 708
 709
 710
 711
 712
 713
 714
 715
 716
 717
 718
 719
 720
 721
 722
 723
 724
 725
 726
 727
 728
 729
 730
 731
 732
 733
 734
 735
 736
 737
 738
 739
 740
 741
 742
 743
 744
 745
 746
 747
 748
 749
 750
 751
 752
 753
 754
 755
 756
 757
 758
 759
 760
 761
 762
 763
 764
 765
 766
 767
 768
 769
 770
 771
 772
 773
 774
 775
 776
 777
 778
 779
 780
 781
 782
 783
 784
 785
 786
 787
 788
 789
 790
 791
 792
 793
 794
 795
 796
 797
 798
 799
 800
 801
 802
 803
 804
 805
 806
 807
 808
 809
 810
 811
 812
 813
 814
 815
 816
 817
 818
 819
 820
 821
 822
 823
 824
 825
 826
 827
 828
 829
 830
 831
 832
 833
 834
 835
 836
 837
 838
 839
 840
 841
 842
 843
 844
 845
 846
 847
 848
 849
 850
 851
 852
 853
 854
 855
 856
 857
 858
 859
 860
 861
 862
 863
 864
 865
 866
 867
 868
 869
 870
 871
 872
 873
 874
 875
 876
 877
 878
 879
 880
 881
 882
 883
 884
 885
 886
 887
 888
 889
 890
 891
 892
 893
 894
 895
 896
 897
 898
 899
 900
 901
 902
 903
 904
 905
 906
 907
 908
 909
 910
 911
 912
 913
 914
 915
 916
 917
 918
 919
 920
 921
 922
 923
 924
 925
 926
 927
 928
 929
 930
 931
 932
 933
 934
 935
 936
 937
 938
 939
 940
 941
 942
 943
 944
 945
 946
 947
 948
 949
 950
 951
 952
 953
 954
 955
 956
 957
 958
 959
 960
 961
 962
 963
 964
 965
 966
 967
 968
 969
 970
 971
 972
 973
 974
 975
 976
 977
 978
 979
 980
 981
 982
 983
 984
 985
 986
 987
 988
 989
 990
 991
 992
 993
 994
 995
 996
 997
 998
 999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
1663
1664
1665
1666
1667
1668
1669
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
1683
1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
1736
1737
1738
1739
1740
1741
1742
1743
1744
1745
1746
1747
1748
1749
1750
1751
1752
1753
1754
1755
1756
1757
1758
1759
1760
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
1777
1778
1779
1780
1781
1782
1783
1784
1785
1786
1787
1788
1789
1790
1791
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
1816
1817
1818
1819
1820
1821
1822
1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
1845
1846
1847
1848
1849
1850
1851
1852
1853
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863
1864
1865
1866
1867
1868
1869
1870
1871
1872
1873
1874
1875
1876
1877
1878
1879
1880
1881
1882
1883
1884
1885
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895
1896
1897
1898
1899
1900
1901
1902
1903
1904
1905
1906
1907
1908
1909
1910
1911
1912
1913
1914
1915
1916
1917
1918
1919
1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
1935
1936
1937
1938
1939
1940
1941
1942
1943
1944
1945
1946
1947
1948
1949
1950
1951
1952
1953
1954
1955
1956
1957
1958
1959
1960
1961
1962
1963
1964
1965
1966
1967
1968
1969
1970
1971
1972
1973
1974
1975
1976
1977
1978
1979
1980
1981
1982
1983
1984
1985
1986
1987
1988
1989
1990
1991
1992
1993
1994
1995
1996
1997
1998
1999
2000
2001
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
2025
2026
2027
2028
2029
2030
2031
2032
2033
2034
2035
2036
2037
2038
2039
2040
2041
2042
2043
2044
2045
2046
2047
2048
2049
2050
2051
2052
2053
2054
2055
2056
2057
2058
2059
2060
2061
2062
2063
2064
2065
2066
2067
2068
2069
2070
2071
2072
2073
2074
2075
2076
2077
2078
2079
2080
2081
2082
2083
2084
2085
2086
2087
2088
2089
2090
2091
2092
2093
2094
2095
2096
2097
2098
2099
2100
2101
2102
2103
2104
2105
2106
2107
2108
2109
2110
2111
2112
2113
2114
2115
2116
2117
2118
2119
2120
2121
2122
2123
2124
2125
2126
2127
2128
2129
2130
2131
2132
2133
2134
2135
2136
2137
2138
2139
2140
2141
2142
2143
2144
2145
2146
2147
2148
2149
2150
2151
2152
2153
2154
2155
2156
2157
2158
2159
2160
2161
2162
2163
2164
2165
2166
2167
2168
2169
2170
2171
2172
2173
2174
2175
2176
2177
2178
2179
2180
2181
2182
2183
2184
2185
2186
2187
2188
2189
2190
2191
2192
2193
2194
2195
2196
2197
2198
2199
2200
2201
2202
2203
2204
2205
2206
2207
2208
2209
2210
2211
2212
2213
2214
2215
2216
2217
2218
2219
2220
2221
2222
2223
2224
2225
2226
2227
2228
2229
2230
2231
2232
2233
2234
2235
2236
2237
2238
2239
2240
2241
2242
2243
2244
2245
2246
2247
2248
2249
2250
2251
2252
2253
2254
2255
2256
2257
2258
2259
2260
2261
2262
2263
2264
2265
2266
2267
2268
2269
2270
2271
2272
2273
2274
2275
2276
2277
2278
2279
2280
2281
2282
2283
2284
2285
2286
2287
2288
2289
2290
2291
2292
2293
2294
2295
2296
2297
2298
2299
2300
2301
2302
2303
2304
2305
2306
2307
2308
2309
2310
2311
2312
2313
2314
2315
2316
2317
2318
2319
2320
2321
2322
2323
2324
2325
2326
2327
2328
2329
2330
2331
2332
2333
2334
2335
2336
2337
2338
2339
2340
2341
2342
2343
2344
2345
2346
2347
2348
2349
2350
2351
2352
2353
2354
2355
2356
2357
2358
2359
2360
2361
2362
2363
2364
2365
2366
2367
2368
2369
2370
2371
2372
2373
2374
2375
2376
2377
2378
2379
2380
2381
2382
2383
2384
2385
2386
2387
2388
2389
2390
2391
2392
2393
2394
2395
2396
2397
2398
2399
2400
2401
2402
2403
2404
2405
2406
2407
2408
2409
2410
2411
2412
2413
2414
2415
2416
2417
2418
2419
2420
2421
2422
2423
2424
2425
2426
2427
2428
2429
2430
2431
2432
2433
2434
2435
2436
2437
2438
2439
2440
2441
2442
2443
2444
2445
2446
2447
2448
2449
2450
2451
2452
2453
2454
2455
2456
2457
2458
2459
2460
2461
2462
2463
2464
2465
2466
2467
2468
2469
2470
2471
2472
2473
2474
2475
2476
2477
2478
2479
2480
2481
2482
2483
2484
2485
2486
2487
2488
2489
2490
2491
2492
2493
2494
2495
2496
2497
2498
2499
2500
2501
2502
2503
2504
2505
2506
2507
2508
2509
2510
2511
2512
2513
2514
2515
2516
2517
2518
2519
2520
2521
2522
2523
2524
2525
2526
2527
2528
2529
2530
2531
2532
2533
2534
2535
2536
2537
2538
2539
2540
2541
2542
2543
2544
2545
2546
2547
2548
2549
2550
2551
2552
2553
2554
2555
2556
2557
2558
2559
2560
2561
2562
2563
2564
2565
2566
2567
2568
2569
2570
2571
2572
2573
2574
2575
2576
2577
2578
2579
2580
2581
2582
2583
2584
2585
2586
2587
2588
2589
2590
2591
2592
2593
2594
2595
2596
2597
2598
2599
2600
2601
2602
2603
2604
2605
2606
2607
2608
2609
2610
2611
2612
2613
2614
2615
2616
2617
2618
2619
2620
2621
2622
2623
2624
2625
2626
2627
2628
2629
2630
2631
2632
2633
2634
2635
2636
2637
2638
2639
2640
2641
2642
2643
2644
2645
2646
2647
2648
2649
2650
2651
2652
2653
2654
2655
2656
2657
2658
2659
2660
2661
2662
2663
2664
2665
2666
2667
2668
2669
2670
2671
2672
2673
2674
2675
2676
2677
2678
2679
2680
2681
2682
2683
2684
2685
2686
2687
2688
2689
2690
2691
2692
2693
2694
2695
2696
2697
2698
2699
2700
2701
2702
2703
2704
2705
2706
2707
2708
2709
2710
2711
2712
2713
2714
2715
2716
2717
2718
2719
2720
2721
2722
2723
2724
2725
2726
2727
2728
2729
2730
2731
2732
2733
2734
2735
2736
2737
2738
2739
2740
2741
2742
2743
2744
2745
2746
2747
2748
2749
2750
2751
2752
2753
2754
2755
2756
2757
2758
2759
2760
2761
2762
2763
2764
2765
2766
2767
2768
2769
2770
2771
2772
2773
2774
2775
2776
2777
2778
2779
2780
2781
2782
2783
2784
2785
2786
2787
2788
2789
2790
2791
2792
2793
2794
2795
2796
2797
2798
2799
2800
2801
2802
2803
2804
2805
2806
2807
2808
2809
2810
2811
2812
2813
2814
// Copyright 2018 Mozilla

// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
//     http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

use std::{collections::{HashMap, HashSet, VecDeque},
          mem};

use error::{ErrorKind, Result};
use tree::{Content, MergeState, MergedNode, Node, Tree};
use guid::{Guid, USER_CONTENT_ROOTS};

/// Structure change types, used to indicate if a node on one side is moved
/// or deleted on the other.
#[derive(PartialEq)]
enum StructureChange {
    /// Node not deleted, or doesn't exist, on the other side.
    Unchanged,
    /// Node moved on the other side.
    Moved,
    /// Node deleted on the other side.
    Deleted,
}

#[derive(Clone, Copy, Default, Debug, Eq, PartialEq)]
pub struct StructureCounts {
    pub new: u64,
    /// Remote non-folder change wins over local deletion.
    pub remote_revives: u64,
    /// Local folder deletion wins over remote change.
    pub local_deletes: u64,
    /// Local non-folder change wins over remote deletion.
    pub local_revives: u64,
    /// Remote folder deletion wins over local change.
    pub remote_deletes: u64,
    /// Deduped local items.
    pub dupes: u64,
}

/// Holds (matching remote dupes for local GUIDs, matching local dupes for
/// remote GUIDs).
type MatchingDupes<'t> = (HashMap<Guid, Node<'t>>, HashMap<Guid, Node<'t>>);

/// Represents an accepted local or remote deletion.
#[derive(Clone, Debug, Eq, PartialEq)]
pub struct Deletion {
    pub guid: Guid,
    pub local_level: i64,
    pub should_upload_tombstone: bool,
}

/// A two-way merger that produces a complete merged tree from a complete local
/// tree and a complete remote tree with changes since the last sync.
///
/// This is ported almost directly from iOS. On iOS, the `ThreeWayMerger` takes
/// a complete "mirror" tree with the server state after the last sync, and two
/// incomplete trees with local and remote changes to the mirror: "local" and
/// "mirror", respectively. Overlaying buffer onto mirror yields the current
/// server tree; overlaying local onto mirror yields the complete local tree.
///
/// Dogear doesn't store the shared parent for changed items, so we can only
/// do two-way merges. Our local tree is the union of iOS's mirror and local,
/// and our remote tree is the union of iOS's mirror and buffer.
///
/// Unlike iOS, Dogear doesn't distinguish between structure and value changes.
/// The `needs_merge` flag notes *that* a bookmark changed, but not *how*. This
/// means we might detect conflicts, and revert changes on one side, for cases
/// that iOS can merge cleanly.
///
/// Fortunately, most of our users don't organize their bookmarks into deeply
/// nested hierarchies, or make conflicting changes on multiple devices
/// simultaneously. A simpler two-way tree merge strikes a good balance between
/// correctness and complexity.
#[derive(Debug)]
pub struct Merger<'t> {
    local_tree: &'t Tree,
    new_local_contents: Option<&'t HashMap<Guid, Content>>,
    remote_tree: &'t Tree,
    new_remote_contents: Option<&'t HashMap<Guid, Content>>,
    matching_dupes_by_local_parent_guid: HashMap<Guid, MatchingDupes<'t>>,
    merged_guids: HashSet<Guid>,
    delete_locally: HashSet<Guid>,
    delete_remotely: HashSet<Guid>,
    structure_counts: StructureCounts,
}

impl<'t> Merger<'t> {
    pub fn new(local_tree: &'t Tree, remote_tree: &'t Tree) -> Merger<'t> {
        Merger { local_tree,
                 new_local_contents: None,
                 remote_tree,
                 new_remote_contents: None,
                 matching_dupes_by_local_parent_guid: HashMap::new(),
                 merged_guids: HashSet::new(),
                 delete_locally: HashSet::new(),
                 delete_remotely: HashSet::new(),
                 structure_counts: StructureCounts::default(), }
    }

    pub fn with_contents(local_tree: &'t Tree,
                         new_local_contents: &'t HashMap<Guid, Content>,
                         remote_tree: &'t Tree,
                         new_remote_contents: &'t HashMap<Guid, Content>)
                         -> Merger<'t>
    {
        Merger { local_tree,
                 new_local_contents: Some(new_local_contents),
                 remote_tree,
                 new_remote_contents: Some(new_remote_contents),
                 matching_dupes_by_local_parent_guid: HashMap::new(),
                 merged_guids: HashSet::new(),
                 delete_locally: HashSet::new(),
                 delete_remotely: HashSet::new(),
                 structure_counts: StructureCounts::default(), }
    }

    pub fn merge(&mut self) -> Result<MergedNode<'t>> {
        let merged_root_node = {
            let local_root_node = self.local_tree.root();
            let remote_root_node = self.remote_tree.root();
            self.two_way_merge(local_root_node, remote_root_node)?
        };

        // Any remaining deletions on one side should be deleted on the other side.
        // This happens when the remote tree has tombstones for items that don't
        // exist locally, or the local tree has tombstones for items that
        // aren't on the server.
        for guid in self.local_tree.deletions() {
            if !self.mentions(guid) {
                self.delete_remotely.insert(guid.clone());
            }
        }
        for guid in self.remote_tree.deletions() {
            if !self.mentions(guid) {
                self.delete_locally.insert(guid.clone());
            }
        }

        Ok(merged_root_node)
    }

    #[inline]
    pub fn telemetry(&self) -> &StructureCounts {
        &self.structure_counts
    }

    #[inline]
    pub fn subsumes(&self, tree: &Tree) -> bool {
        tree.guids().all(|guid| self.mentions(guid))
    }

    #[inline]
    pub fn deletions<'m>(&'m self) -> impl Iterator<Item = Deletion> + 'm {
        self.local_deletions().chain(self.remote_deletions())
    }

    fn local_deletions<'m>(&'m self) -> impl Iterator<Item = Deletion> + 'm {
        self.delete_locally.iter().filter_map(move |guid| {
            if self.delete_remotely.contains(guid) {
                None
            } else {
                let local_level = self.local_tree
                                      .node_for_guid(guid)
                                      .map(|node| node.level())
                                      .unwrap_or(-1);
                // Items that should be deleted locally already have tombstones
                // on the server, so we don't need to upload tombstones for
                // these deletions.
                Some(Deletion { guid: guid.clone(),
                                local_level,
                                should_upload_tombstone: false, })
            }
        })
    }

    fn remote_deletions<'m>(&'m self) -> impl Iterator<Item = Deletion> + 'm {
        self.delete_remotely.iter().map(move |guid| {
            let local_level = self.local_tree
                                  .node_for_guid(guid)
                                  .map(|node| node.level())
                                  .unwrap_or(-1);
            Deletion { guid: guid.to_owned(),
                       local_level,
                       should_upload_tombstone: true, }
        })
    }

    #[inline]
    fn mentions(&self, guid: &Guid) -> bool {
        self.merged_guids.contains(guid) ||
        self.delete_locally.contains(guid) ||
        self.delete_remotely.contains(guid)
    }

    fn merge_local_node(&mut self, local_node: Node<'t>) -> Result<MergedNode<'t>> {
        trace!("Item {} only exists locally", local_node);

        self.merged_guids.insert(local_node.guid.clone());

        let mut merged_node = MergedNode::new(local_node.guid.clone(),
                                              MergeState::local(local_node));
        if local_node.is_folder() {
            // The local folder doesn't exist remotely, but its children might, so
            // we still need to recursively walk and merge them. This method will
            // change the merge state from local to new if any children were moved
            // or deleted.
            let merge_state_changed =
                self.merge_local_children_into_merged_node(&mut merged_node, local_node, None)?;
            if merge_state_changed {
                let new_merge_state = MergeState::new(merged_node.merge_state);
                trace!("Merge state for {} has new structure {}",
                       merged_node,
                       new_merge_state);
                self.structure_counts.new += 1;
                merged_node.merge_state = new_merge_state;
            }
        }
        Ok(merged_node)
    }

    fn merge_remote_node(&mut self, remote_node: Node<'t>) -> Result<MergedNode<'t>> {
        trace!("Item {} only exists remotely", remote_node);

        self.merged_guids.insert(remote_node.guid.clone());

        let mut merged_node = MergedNode::new(remote_node.guid.clone(),
                                              MergeState::remote(remote_node));
        if remote_node.is_folder() {
            // As above, a remote folder's children might still exist locally, so we
            // need to merge them and update the merge state from remote to new if
            // any children were moved or deleted.
            let merge_state_changed =
                self.merge_remote_children_into_merged_node(&mut merged_node, None, remote_node)?;
            if merge_state_changed {
                let new_merge_state = MergeState::new(merged_node.merge_state);
                trace!("Merge state for {} has new structure {}",
                       merged_node,
                       new_merge_state);
                self.structure_counts.new += 1;
                merged_node.merge_state = new_merge_state;
            }
        }
        Ok(merged_node)
    }

    /// Merges two nodes that exist locally and remotely.
    fn two_way_merge(&mut self,
                     local_node: Node<'t>,
                     remote_node: Node<'t>)
                     -> Result<MergedNode<'t>>
    {
        trace!("Item exists locally as {} and remotely as {}", local_node, remote_node);

        self.merged_guids.insert(remote_node.guid.clone());

        if &local_node.guid != &remote_node.guid {
            // We deduped a NEW local item to a remote item.
            self.merged_guids.insert(local_node.guid.clone());
        }

        let merge_state = self.resolve_two_value_conflict(local_node, remote_node);
        trace!("Merge state for {} is {}", remote_node.guid, merge_state);

        let mut merged_node = MergedNode::new(remote_node.guid.clone(), merge_state);

        if !local_node.has_compatible_kind(&remote_node) {
            error!("Merging local {} and remote {} with different kinds",
                   local_node, remote_node);
            return Err(ErrorKind::MismatchedItemKind(local_node.kind, remote_node.kind).into());
        }

        if local_node.is_folder() && remote_node.is_folder() {
            // Merging two folders, so we need to walk their children to handle
            // structure changes.
            trace!("Merging folders {} and {}", local_node, remote_node);
            let merge_state_changed = if local_node.newer_than(&remote_node) {
                // The folder exists locally and remotely, and the local node is newer.
                // Walk and merge local children first, followed by remaining unmerged
                // remote children.
                let local_merge_state_changed =
                    self.merge_local_children_into_merged_node(&mut merged_node,
                                                               local_node,
                                                               Some(remote_node))?;
                let remote_merge_state_changed =
                    self.merge_remote_children_into_merged_node(&mut merged_node,
                                                                Some(local_node),
                                                                remote_node)?;
                local_merge_state_changed || remote_merge_state_changed
            } else {
                // The folder exists locally and remotely, and the remote node is newer.
                // Merge remote children first, then remaining local children.
                let remote_merge_state_changed =
                    self.merge_remote_children_into_merged_node(&mut merged_node,
                                                                Some(local_node),
                                                                remote_node)?;
                let local_merge_state_changed =
                    self.merge_local_children_into_merged_node(&mut merged_node,
                                                               local_node,
                                                               Some(remote_node))?;
                remote_merge_state_changed || local_merge_state_changed
            };

            // Update the merge state if we moved children orphaned on one side by a
            // deletion on the other side, if we kept newer locally moved children,
            // or if the child order changed. We already updated the merge state of the
            // orphans, but we also need to flag the containing folder so that it's
            // reuploaded to the server along with the new children.
            if merge_state_changed {
                let new_merge_state = MergeState::new(merged_node.merge_state);
                trace!("Merge state for {} has new structure {}",
                       merged_node,
                       new_merge_state);
                self.structure_counts.new += 1;
                merged_node.merge_state = new_merge_state;
            }
            return Ok(merged_node);
        }

        // Merging two non-folders, or a local folder and a remote livemark, so
        // there's no need to walk children.
        trace!("Merging non-folders {} and {}", local_node, remote_node);
        Ok(merged_node)
    }

    /// Determines the merge state for a node that exists locally and remotely.
    fn resolve_two_value_conflict(&mut self,
                                  local_node: Node<'t>,
                                  remote_node: Node<'t>)
                                  -> MergeState<'t>
    {
        if USER_CONTENT_ROOTS.contains(&remote_node.guid) {
            // Don't update root titles or other properties.
            return MergeState::local(local_node);
        }
        if !remote_node.needs_merge {
            // The node wasn't changed remotely since the last sync. Keep the local
            // state.
            return MergeState::local(remote_node);
        }
        if !local_node.needs_merge {
            // The node was changed remotely, but not locally. Take the remote state.
            return MergeState::remote(remote_node);
        }
        // At this point, we know the item changed locally and remotely. Use the
        // timestamp to decide which node is newer.
        if local_node.newer_than(&remote_node) {
            MergeState::local(local_node)
        } else {
            MergeState::remote(remote_node)
        }
    }

    /// Merges a remote child node into a merged folder node. This handles the
    /// following cases:
    ///
    /// - The remote child is locally deleted. We recursively move all of its
    ///   descendants that don't exist locally to the merged folder.
    /// - The remote child doesn't exist locally, but has a content match in the
    ///   corresponding local folder. We dedupe the local child to the remote
    ///   child.
    /// - The remote child exists locally, but in a different folder. We compare
    ///   merge flags and timestamps to decide where to keep the child.
    /// - The remote child exists locally, and in the same folder. We merge the
    ///   local and remote children.
    ///
    /// This is the inverse of `merge_local_child_into_merged_node`.
    ///
    /// Returns `true` if the merged structure state changed because the remote
    /// child was locally moved or deleted; `false` otherwise.
    fn merge_remote_child_into_merged_node(&mut self,
                                           merged_node: &mut MergedNode<'t>,
                                           local_parent_node: Option<Node<'t>>,
                                           remote_parent_node: Node<'t>,
                                           remote_child_node: Node<'t>)
                                           -> Result<bool>
    {
        if self.merged_guids.contains(&remote_child_node.guid) {
            trace!("Remote child {} already seen in another folder and merged",
                   remote_child_node);
            return Ok(false);
        }

        trace!("Merging remote child {} of {} into {}",
               remote_child_node,
               remote_parent_node,
               merged_node);

        // Make sure the remote child isn't locally deleted.
        if self.check_for_local_structure_change_of_remote_node(merged_node,
                                                                remote_parent_node,
                                                                remote_child_node)? ==
           StructureChange::Deleted
        {
            // If the remote child is locally deleted, we need to move all descendants
            // that aren't also remotely deleted to the merged node. This handles the
            // case where a user deletes a folder on this device, and adds a bookmark
            // to the same folder on another device. We want to keep the folder
            // deleted, but we also don't want to lose the new bookmark, so we move
            // the bookmark to the deleted folder's parent.
            return Ok(true);
        }

        // The remote child isn't locally deleted. Does it exist in the local tree?
        if let Some(local_child_node) = self.local_tree.node_for_guid(&remote_child_node.guid) {
            // Otherwise, the remote child exists in the local tree. Did it move?
            let local_parent_node =
                local_child_node.parent()
                                .expect("Can't merge existing remote child without local parent");

            trace!("Remote child {} exists locally in {} and remotely in {}",
                   remote_child_node,
                   local_parent_node,
                   remote_parent_node);

            if self.remote_tree.is_deleted(&local_parent_node.guid) {
                trace!("Unconditionally taking remote move for {} to {} because local parent {} \
                        is deleted remotely",
                       remote_child_node,
                       remote_parent_node,
                       local_parent_node);

                let merged_child_node = self.two_way_merge(local_child_node,
                                                           remote_child_node)?;
                merged_node.merged_children.push(merged_child_node);
                return Ok(false);
            }

            match (local_parent_node.needs_merge, remote_parent_node.needs_merge) {
                (true, true) => {
                    trace!("Local {} and remote {} parents changed; comparing modified times to \
                            decide parent for remote child {}",
                           local_parent_node,
                           remote_parent_node,
                           remote_child_node);

                    let latest_local_age = local_child_node.age.min(local_parent_node.age);
                    let latest_remote_age = remote_child_node.age.min(remote_parent_node.age);

                    if latest_local_age < latest_remote_age {
                        // Local move is younger, so we ignore the remote move. We'll
                        // merge the child later, when we walk its new local parent.
                        trace!("Ignoring older remote move for {} to {} at {}; local move to {} \
                                at {} is newer",
                               remote_child_node,
                               remote_parent_node,
                               latest_remote_age,
                               local_parent_node,
                               latest_local_age);
                        return Ok(true);
                    }

                    // Otherwise, the remote move is younger, so we ignore the local move
                    // and merge the child now.
                    trace!("Taking newer remote move for {} to {} at {}; local move to {} at {} \
                            is older",
                           remote_child_node,
                           remote_parent_node,
                           latest_remote_age,
                           local_parent_node,
                           latest_local_age);

                    let merged_child_node = self.two_way_merge(local_child_node,
                                                               remote_child_node)?;
                    merged_node.merged_children.push(merged_child_node);
                    return Ok(false);
                },

                (true, false) => {
                    trace!("Remote parent unchanged; keeping remote child {} in {}",
                           remote_child_node,
                           local_parent_node);
                    return Ok(true);
                },

                (false, _) => {
                    trace!("Local parent unchanged; keeping remote child {} in {}",
                           remote_child_node,
                           remote_parent_node);
                    let merged_child_node = self.two_way_merge(local_child_node,
                                                               remote_child_node)?;
                    merged_node.merged_children.push(merged_child_node);
                    return Ok(false);
                },
            }
        } else {
            // Remote child is not a root, and doesn't exist locally. Try to find a
            // content match in the containing folder, and dedupe the local item if
            // we can.
            trace!("Remote child {} doesn't exist locally; looking for local content match",
                   remote_child_node);
            let merged_child_node = if let Some(local_child_node_by_content) =
                self.find_local_node_matching_remote_node(merged_node,
                                                          local_parent_node,
                                                          remote_parent_node,
                                                          remote_child_node)
            {
                self.two_way_merge(local_child_node_by_content,
                                   remote_child_node)
            } else {
                self.merge_remote_node(remote_child_node)
            }?;
            merged_node.merged_children.push(merged_child_node);
            return Ok(false);
        }
    }

    /// Merges a local child node into a merged folder node.
    ///
    /// This is the inverse of `merge_remote_child_into_merged_node`.
    ///
    /// Returns `true` if the merged structure state changed because the local
    /// child doesn't exist remotely or was locally moved; `false` otherwise.
    ///
    fn merge_local_child_into_merged_node(&mut self,
                                          merged_node: &mut MergedNode<'t>,
                                          local_parent_node: Node<'t>,
                                          remote_parent_node: Option<Node<'t>>,
                                          local_child_node: Node<'t>)
                                          -> Result<bool>
    {
        if self.merged_guids.contains(&local_child_node.guid) {
            // We already merged the child when we walked another folder.
            trace!("Local child {} already seen in another folder and merged",
                   local_child_node);
            return Ok(false);
        }

        trace!("Merging local child {} of {} into {}",
               local_child_node,
               local_parent_node,
               merged_node);

        // Now, we know we haven't seen the local child before, and it's not in
        // this folder on the server. Check if the child is remotely deleted.
        if self.check_for_remote_structure_change_of_local_node(merged_node,
                                                                local_parent_node,
                                                                local_child_node)? ==
           StructureChange::Deleted
        {
            // If the child is remotely deleted, we need to move any new local
            // descendants to the merged node, just as we did for new remote
            // descendants of locally deleted children.
            return Ok(true);
        }

        // At this point, we know the local child isn't deleted. See if it
        // exists in the remote tree.
        if let Some(remote_child_node) = self.remote_tree.node_for_guid(&local_child_node.guid) {
            // The local child exists remotely. It must have moved; otherwise, we
            // would have seen it when we walked the remote children.
            let remote_parent_node =
                remote_child_node.parent()
                                 .expect("Can't merge existing local child without remote parent");

            trace!("Local child {} exists locally in {} and remotely in {}",
                   local_child_node,
                   local_parent_node,
                   remote_parent_node);

            if self.local_tree.is_deleted(&remote_parent_node.guid) {
                trace!("Unconditionally taking local move for {} to {} because remote parent {} \
                        is deleted locally",
                       local_child_node,
                       local_parent_node,
                       remote_parent_node);

                let merged_child_node = self.two_way_merge(local_child_node,
                                                           remote_child_node)?;
                merged_node.merged_children.push(merged_child_node);
                return Ok(true);
            }

            match (local_parent_node.needs_merge, remote_parent_node.needs_merge) {
                (true, true) => {
                    trace!("Local {} and remote {} parents changed; comparing modified times to \
                            decide parent for local child {}",
                           local_parent_node,
                           remote_parent_node,
                           local_child_node);

                    let latest_local_age = local_child_node.age.min(local_parent_node.age);
                    let latest_remote_age = remote_child_node.age.min(remote_parent_node.age);

                    if latest_remote_age <= latest_local_age {
                        trace!("Ignoring older local move for {} to {} at {}; remote move to {} \
                                at {} is newer",
                               local_child_node,
                               local_parent_node,
                               latest_local_age,
                               remote_parent_node,
                               latest_remote_age);
                        return Ok(false);
                    }

                    trace!("Taking newer local move for {} to {} at {}; remote move to {} at {} \
                            is older",
                           local_child_node,
                           local_parent_node,
                           latest_local_age,
                           remote_parent_node,
                           latest_remote_age);

                    let merged_child_node = self.two_way_merge(local_child_node,
                                                               remote_child_node)?;
                    merged_node.merged_children.push(merged_child_node);
                    return Ok(true);
                },
                (true, false) => {
                    trace!("Remote parent unchanged; keeping local child {} in local parent {}",
                           local_child_node,
                           local_parent_node);

                    let merged_child_node = self.two_way_merge(local_child_node,
                                                               remote_child_node)?;
                    merged_node.merged_children.push(merged_child_node);
                    return Ok(true);
                },
                (false, _) => {
                    trace!("Local parent unchanged; keeping local child {} in remote parent {}",
                           local_child_node,
                           remote_parent_node);
                    return Ok(false);
                },
            }
        } else {
            // Local child is not a root, and doesn't exist remotely. Try to find a
            // content match in the containing folder, and dedupe the local item if
            // we can.
            trace!("Local child {} doesn't exist remotely; looking for remote content match",
                   local_child_node);
            if let Some(remote_child_node_by_content) =
                self.find_remote_node_matching_local_node(merged_node,
                                                          local_parent_node,
                                                          remote_parent_node,
                                                          local_child_node)
            {
                // The local child has a remote content match, so take the remote GUID
                // and merge.
                let merged_child_node = self.two_way_merge(local_child_node,
                                                           remote_child_node_by_content)?;
                merged_node.merged_children.push(merged_child_node);
                return Ok(false);
            } else {
                // The local child doesn't exist remotely, but we still need to walk
                // its children.
                let merged_child_node = self.merge_local_node(local_child_node)?;
                merged_node.merged_children.push(merged_child_node);
                return Ok(true);
            }
        }
    }

    /// Recursively merges the children of a remote folder node.
    ///
    /// Returns `true` if the merge produced a new structure that should be
    /// reuploaded to the server; `false` otherwise.
    fn merge_remote_children_into_merged_node(&mut self,
                                              merged_node: &mut MergedNode<'t>,
                                              local_node: Option<Node<'t>>,
                                              remote_node: Node<'t>)
                                              -> Result<bool>
    {
        trace!("Merging remote children of {} into {}",
               remote_node,
               merged_node);

        let mut merge_state_changed = false;
        for remote_child_node in remote_node.children() {
            let remote_children_changed =
                self.merge_remote_child_into_merged_node(merged_node,
                                                         local_node,
                                                         remote_node,
                                                         remote_child_node)?;
            if remote_children_changed {
                merge_state_changed = true;
            }
        }

        Ok(merge_state_changed)
    }

    /// Recursively merges the children of a local folder node.
    ///
    /// Returns `true` if the merge produced a new structure that should be
    /// reuploaded to the server; `false` otherwise.
    fn merge_local_children_into_merged_node(&mut self,
                                             merged_node: &mut MergedNode<'t>,
                                             local_node: Node<'t>,
                                             remote_node: Option<Node<'t>>)
                                             -> Result<bool>
    {
        trace!("Merging local children of {} into {}",
               local_node,
               merged_node);

        let mut merge_state_changed = false;
        for local_child_node in local_node.children() {
            let remote_children_changed =
                self.merge_local_child_into_merged_node(merged_node,
                                                        local_node,
                                                        remote_node,
                                                        local_child_node)?;
            if remote_children_changed {
                merge_state_changed = true;
            }
        }

        Ok(merge_state_changed)
    }

    /// Checks if a remote node is locally moved or deleted, and reparents any
    /// descendants that aren't also remotely deleted to the merged node.
    ///
    /// This is the inverse of
    /// `check_for_remote_structure_change_of_local_node`.
    fn check_for_local_structure_change_of_remote_node(&mut self,
                                                       merged_node: &mut MergedNode<'t>,
                                                       remote_parent_node: Node<'t>,
                                                       remote_node: Node<'t>)
                                                       -> Result<StructureChange>
    {
        if !remote_node.is_syncable() {
            // If the remote node is known to be non-syncable, we unconditionally
            // delete it from the server, even if it's syncable locally.
            self.delete_remotely.insert(remote_node.guid.clone());
            if remote_node.is_folder() {
                // If the remote node is a folder, we also need to walk its descendants
                // and reparent any syncable descendants, and descendants that only
                // exist remotely, to the merged node.
                self.relocate_remote_orphans_to_merged_node(merged_node, remote_node)?;
            }
            return Ok(StructureChange::Deleted);
        }

        if !self.local_tree.is_deleted(&remote_node.guid) {
            if let Some(local_node) = self.local_tree.node_for_guid(&remote_node.guid) {
                if !local_node.is_syncable() {
                    // The remote node is syncable, but the local node is non-syncable.
                    // For consistency with Desktop, we unconditionally delete the
                    // node from the server.
                    self.delete_remotely.insert(remote_node.guid.clone());
                    if remote_node.is_folder() {
                        self.relocate_remote_orphans_to_merged_node(merged_node, remote_node)?;
                    }
                    return Ok(StructureChange::Deleted);
                }
                let local_parent_node =
                    local_node.parent()
                              .expect("Can't check for structure changes without local parent");
                if local_parent_node.guid != remote_parent_node.guid {
                    return Ok(StructureChange::Moved);
                }
                return Ok(StructureChange::Unchanged);
            } else {
                return Ok(StructureChange::Unchanged);
            }
        }

        if remote_node.needs_merge {
            if !remote_node.is_folder() {
                // If a non-folder child is deleted locally and changed remotely, we
                // ignore the local deletion and take the remote child.
                trace!("Remote non-folder {} deleted locally and changed remotely; taking remote \
                        change",
                       remote_node);
                self.structure_counts.remote_revives += 1;
                return Ok(StructureChange::Unchanged);
            }
            // For folders, we always take the local deletion and relocate remotely
            // changed grandchildren to the merged node. We could use the remote
            // tree to revive the child folder, but it's easier to relocate orphaned
            // grandchildren than to partially revive the child folder.
            trace!("Remote folder {} deleted locally and changed remotely; taking local deletion",
                   remote_node);
            self.structure_counts.local_deletes += 1;
        } else {
            trace!("Remote node {} deleted locally and not changed remotely; taking local \
                    deletion",
                   remote_node);
        }

        // Take the local deletion and relocate any new remote descendants to the
        // merged node.
        self.delete_remotely.insert(remote_node.guid.clone());
        if remote_node.is_folder() {
            self.relocate_remote_orphans_to_merged_node(merged_node, remote_node)?;
        }
        Ok(StructureChange::Deleted)
    }

    /// Checks if a local node is remotely moved or deleted, and reparents any
    /// descendants that aren't also locally deleted to the merged node.
    ///
    /// This is the inverse of
    /// `check_for_local_structure_change_of_remote_node`.
    fn check_for_remote_structure_change_of_local_node(&mut self,
                                                       merged_node: &mut MergedNode<'t>,
                                                       local_parent_node: Node<'t>,
                                                       local_node: Node<'t>)
                                                       -> Result<StructureChange>
    {
        if !local_node.is_syncable() {
            // If the local node is known to be non-syncable, we unconditionally
            // delete it from the local tree, even if it's syncable remotely.
            self.delete_locally.insert(local_node.guid.clone());
            if local_node.is_folder() {
                self.relocate_local_orphans_to_merged_node(merged_node, local_node)?;
            }
            return Ok(StructureChange::Deleted);
        }

        if !self.remote_tree.is_deleted(&local_node.guid) {
            if let Some(remote_node) = self.remote_tree.node_for_guid(&local_node.guid) {
                if !remote_node.is_syncable() {
                    // The local node is syncable, but the remote node is non-syncable.
                    // This can happen if we applied an orphaned left pane query in a
                    // previous sync, and later saw the left pane root on the server.
                    // Since we now have the complete subtree, we can remove the item.
                    self.delete_locally.insert(local_node.guid.clone());
                    if remote_node.is_folder() {
                        self.relocate_local_orphans_to_merged_node(merged_node, local_node)?;
                    }
                    return Ok(StructureChange::Deleted);
                }
                let remote_parent_node =
                    remote_node.parent()
                               .expect("Can't check for structure changes without remote parent");
                if remote_parent_node.guid != local_parent_node.guid {
                    return Ok(StructureChange::Moved);
                }
                return Ok(StructureChange::Unchanged);
            } else {
                return Ok(StructureChange::Unchanged);
            }
        }

        if local_node.needs_merge {
            if !local_node.is_folder() {
                trace!("Local non-folder {} deleted remotely and changed locally; taking local \
                        change",
                       local_node);
                self.structure_counts.local_revives += 1;
                return Ok(StructureChange::Unchanged);
            }
            trace!("Local folder {} deleted remotely and changed locally; taking remote deletion",
                   local_node);
            self.structure_counts.remote_deletes += 1;
        } else {
            trace!("Local node {} deleted remotely and not changed locally; taking remote \
                    deletion",
                   local_node);
        }

        // Take the remote deletion and relocate any new local descendants to the
        // merged node.
        self.delete_locally.insert(local_node.guid.clone());
        if local_node.is_folder() {
            self.relocate_local_orphans_to_merged_node(merged_node, local_node)?;
        }
        Ok(StructureChange::Deleted)
    }

    /// Takes a local deletion for a remote node by marking the node as deleted,
    /// and relocating all remote descendants that aren't also locally deleted
    /// to the closest surviving ancestor. We do this to avoid data loss if
    /// the user adds a bookmark to a folder on another device, and deletes
    /// that folder locally.
    ///
    /// This is the inverse of `relocate_local_orphans_to_merged_node`.
    fn relocate_remote_orphans_to_merged_node(&mut self,
                                              merged_node: &mut MergedNode<'t>,
                                              remote_node: Node<'t>)
                                              -> Result<()>
    {
        for remote_child_node in remote_node.children() {
            match self.check_for_local_structure_change_of_remote_node(merged_node,
                                                                       remote_node,
                                                                       remote_child_node)?
            {
                StructureChange::Moved | StructureChange::Deleted => {
                    // The remote child is already moved or deleted locally, so we should
                    // ignore it instead of treating it as a remote orphan.
                    continue;
                },
                StructureChange::Unchanged => {
                    trace!("Relocating remote orphan {} to {}",
                           remote_child_node,
                           merged_node);
                    let mut merged_orphan_node = if let Some(local_child_node) =
                        self.local_tree.node_for_guid(&remote_child_node.guid)
                    {
                        self.two_way_merge(local_child_node, remote_child_node)
                    } else {
                        self.merge_remote_node(remote_child_node)
                    }?;

                    // Flag the moved orphan for reupload.
                    let merge_state = MergeState::new(merged_orphan_node.merge_state);
                    merged_orphan_node.merge_state = merge_state;
                    merged_node.merged_children.push(merged_orphan_node);
                },
            }
        }
        Ok(())
    }

    /// Takes a remote deletion for a local node by marking the node as deleted,
    /// and relocating all local descendants that aren't also remotely deleted
    /// to the closest surviving ancestor.
    ///
    /// This is the inverse of `relocate_remote_orphans_to_merged_node`.
    fn relocate_local_orphans_to_merged_node(&mut self,
                                             merged_node: &mut MergedNode<'t>,
                                             local_node: Node<'t>)
                                             -> Result<()>
    {
        for local_child_node in local_node.children() {
            match self.check_for_remote_structure_change_of_local_node(merged_node,
                                                                       local_node,
                                                                       local_child_node)?
            {
                StructureChange::Moved | StructureChange::Deleted => {
                    // The local child is already moved or deleted remotely, so we should
                    // ignore it instead of treating it as a local orphan.
                    continue;
                },
                StructureChange::Unchanged => {
                    trace!("Relocating local orphan {} to {}",
                           local_child_node,
                           merged_node);
                    let mut merged_orphan_node = if let Some(remote_child_node) =
                        self.remote_tree.node_for_guid(&local_child_node.guid)
                    {
                        self.two_way_merge(local_child_node, remote_child_node)
                    } else {
                        self.merge_local_node(local_child_node)
                    }?;

                    let merge_state = MergeState::new(merged_orphan_node.merge_state);
                    merged_orphan_node.merge_state = merge_state;
                    merged_node.merged_children.push(merged_orphan_node);
                },
            }
        }
        Ok(())
    }

    /// Finds all children of a local folder with similar content as children of
    /// the corresponding remote folder. This is used to dedupe local items that
    /// haven't been uploaded yet, to remote items that don't exist locally.
    ///
    /// Recall that we match items by GUID as we walk down the tree. If a GUID
    /// on one side doesn't exist on the other, we fall back to a content
    /// match in the same folder.
    ///
    /// This method is called the first time that
    /// `find_remote_node_matching_local_node` merges a local child that
    /// doesn't exist remotely, and
    /// the first time that `find_local_node_matching_remote_node` merges a
    /// remote child that doesn't exist locally.
    ///
    /// Finding all possible dupes is O(m + n) in the worst case, where `m` is
    /// the number of local children, and `n` is the number of remote
    /// children. We cache matches in
    /// `matching_dupes_by_local_parent_guid`, so deduping all
    /// remaining children of the same folder, on both sides, only needs two
    /// O(1) map lookups per child.
    fn find_all_matching_dupes_in_folders(&self,
                                          local_parent_node: Node<'t>,
                                          remote_parent_node: Node<'t>)
                                          -> MatchingDupes<'t>
    {
        let mut dupe_key_to_local_nodes: HashMap<&Content, VecDeque<_>> = HashMap::new();

        for local_child_node in local_parent_node.children() {
            if let Some(local_child_content) =
                self.new_local_contents
                    .and_then(|contents| contents.get(&local_child_node.guid))
            {
                if let Some(remote_child_node) =
                    self.remote_tree.node_for_guid(&local_child_node.guid)
                {
                    trace!("Not deduping local child {}; already exists remotely as {}",
                           local_child_node,
                           remote_child_node);
                    continue;
                }
                if self.remote_tree.is_deleted(&local_child_node.guid) {
                    trace!("Not deduping local child {}; deleted remotely",
                           local_child_node);
                    continue;
                }
                // Store matching local children in an array, in case multiple children
                // have the same dupe key (for example, a toolbar containing multiple
                // empty folders, as in bug 1213369).
                let local_nodes_for_key = dupe_key_to_local_nodes.entry(local_child_content)
                                                                 .or_default();
                local_nodes_for_key.push_back(local_child_node);
            } else {
                trace!("Not deduping local child {}; already uploaded",
                       local_child_node);
            }
        }

        let mut local_to_remote = HashMap::new();
        let mut remote_to_local = HashMap::new();

        for remote_child_node in remote_parent_node.children() {
            if remote_to_local.contains_key(&remote_child_node.guid) {
                trace!("Not deduping remote child {}; already deduped",
                       remote_child_node);
                continue;
            }
            // Note that we don't need to check if the remote node is deleted
            // locally, because it wouldn't have local content entries if it
            // were.
            if let Some(remote_child_content) =
                self.new_remote_contents
                    .and_then(|contents| contents.get(&remote_child_node.guid))
            {
                if let Some(mut local_nodes_for_key) =
                    dupe_key_to_local_nodes.get_mut(remote_child_content)
                {
                    if let Some(local_child_node) = local_nodes_for_key.pop_front() {
                        trace!("Deduping local child {} to remote child {}",
                               local_child_node,
                               remote_child_node);
                        local_to_remote.insert(local_child_node.guid.clone(), remote_child_node);
                        remote_to_local.insert(remote_child_node.guid.clone(), local_child_node);
                    } else {
                        trace!("Not deduping remote child {}; no remaining local content matches",
                               remote_child_node);
                        continue;
                    }
                } else {
                    trace!("Not deduping remote child {}; no local content matches",
                           remote_child_node);
                    continue;
                }
            } else {
                trace!("Not deduping remote child {}; already merged",
                       remote_child_node);
            }
        }

        (local_to_remote, remote_to_local)
    }

    /// Finds a remote node with a different GUID that matches the content of a
    /// local node.
    ///
    /// This is the inverse of `find_local_node_matching_remote_node`.
    fn find_remote_node_matching_local_node(&mut self,
                                            merged_node: &MergedNode<'t>,
                                            local_parent_node: Node<'t>,
                                            remote_parent_node: Option<Node<'t>>,
                                            local_child_node: Node<'t>)
                                            -> Option<Node<'t>>
    {
        if let Some(remote_parent_node) = remote_parent_node {
            let mut matching_dupes_by_local_parent_guid =
                mem::replace(&mut self.matching_dupes_by_local_parent_guid,
                             HashMap::new());
            let new_remote_node =
                {
                    let (local_to_remote, _) = matching_dupes_by_local_parent_guid
                    .entry(local_parent_node.guid.clone())
                    .or_insert_with(|| {
                        trace!("First local child {} doesn't exist remotely; finding all \
                                matching dupes in local {} and remote {}",
                                local_child_node,
                                local_parent_node,
                                remote_parent_node);
                        self.find_all_matching_dupes_in_folders(
                            local_parent_node,
                            remote_parent_node,
                        )
                    });
                    let new_remote_node = local_to_remote.get(&local_child_node.guid);
                    new_remote_node.map(|node| {
                        self.structure_counts.dupes += 1;
                        *node
                    })
                };
            mem::replace(&mut self.matching_dupes_by_local_parent_guid,
                         matching_dupes_by_local_parent_guid);
            new_remote_node
        } else {
            trace!("Merged node {} doesn't exist remotely; no potential dupes for local child {}",
                   merged_node,
                   local_child_node);
            None
        }
    }

    /// Finds a local node with a different GUID that matches the content of a
    /// remote node.
    ///
    /// This is the inverse of `find_remote_node_matching_local_node`.
    fn find_local_node_matching_remote_node(&mut self,
                                            merged_node: &MergedNode<'t>,
                                            local_parent_node: Option<Node<'t>>,
                                            remote_parent_node: Node<'t>,
                                            remote_child_node: Node<'t>)
                                            -> Option<Node<'t>>
    {
        if let Some(local_parent_node) = local_parent_node {
            let mut matching_dupes_by_local_parent_guid =
                mem::replace(&mut self.matching_dupes_by_local_parent_guid,
                             HashMap::new());
            let new_local_node =
                {
                    let (_, remote_to_local) = matching_dupes_by_local_parent_guid
                    .entry(local_parent_node.guid.clone())
                    .or_insert_with(|| {
                        trace!("First remote child {} doesn't exist locally; finding all \
                                matching dupes in local {} and remote {}",
                                remote_child_node,
                                local_parent_node,
                                remote_parent_node);
                        self.find_all_matching_dupes_in_folders(
                            local_parent_node,
                            remote_parent_node,
                        )
                    });
                    let new_local_node = remote_to_local.get(&remote_child_node.guid);
                    new_local_node.map(|node| {
                        self.structure_counts.dupes += 1;
                        *node
                    })
                };
            mem::replace(&mut self.matching_dupes_by_local_parent_guid,
                         matching_dupes_by_local_parent_guid);
            new_local_node
        } else {
            trace!("Merged node {} doesn't exist locally; no potential dupes for remote child {}",
                   merged_node,
                   remote_child_node);
            None
        }
    }
}

#[cfg(test)]
mod tests {
    extern crate env_logger;

    use super::*;
    use std::sync::Once;

    use guid::ROOT_GUID;
    use tree::{Item, Kind};

    #[derive(Debug)]
    struct Node {
        item: Item,
        children: Vec<Box<Node>>,
    }

    impl Node {
        fn new(item: Item) -> Node {
            Node { item, children: Vec::new() }
        }

        fn into_tree(self) -> Result<Tree> {
            fn inflate(tree: &mut Tree, parent_guid: &Guid, node: Node) -> Result<()> {
                let guid = node.item.guid.clone();
                tree.insert(&parent_guid, node.item)?;
                for child in node.children {
                    inflate(tree, &guid, *child)?;
                }
                Ok(())
            }

            let guid = self.item.guid.clone();
            let mut tree = Tree::new(self.item);
            for child in self.children {
                inflate(&mut tree, &guid, *child)?;
            }
            Ok(tree)
        }
    }

    macro_rules! nodes {
        ($children:tt) => { nodes!(ROOT_GUID, Folder, $children) };
        ($guid:expr, $kind:ident) => { nodes!(Guid::from($guid), $kind[]) };
        ($guid:expr, $kind:ident [ $( $name:ident = $value:expr ),* ]) => {{
            let mut item = Item::new(Guid::from($guid), Kind::$kind);
            $({ item.$name = $value; })*
            Node::new(item)
        }};
        ($guid:expr, $kind:ident, $children:tt) => { nodes!($guid, $kind[], $children) };
        ($guid:expr, $kind:ident [ $( $name:ident = $value:expr ),* ], { $(( $($children:tt)+ )),* }) => {{
            let mut node = nodes!($guid, $kind [ $( $name = $value ),* ]);
            $({
                let child = nodes!($($children)*);
                node.children.push(child.into());
            })*
            node
        }};
    }

    fn before_each() {
        static ONCE: Once = Once::new();
        ONCE.call_once(|| {
                           env_logger::init();
                       });
    }

    #[test]
    fn reparent_and_reposition() {
        before_each();

        let local_tree = nodes!({
            ("menu________", Folder[needs_merge = true], {
                ("folderAAAAAA", Folder[needs_merge = true], {
                    ("bookmarkAAAA", Bookmark[needs_merge = true]),
                    ("folderBBBBBB", Folder[needs_merge = true], {
                        ("bookmarkCCCC", Bookmark[needs_merge = true]),
                        ("bookmarkDDDD", Bookmark[needs_merge = true])
                    }),
                    ("bookmarkEEEE", Bookmark[needs_merge = true])
                }),
                ("bookmarkFFFF", Bookmark[needs_merge = true])
            })
        }).into_tree().unwrap();

        let remote_tree = nodes!({
            ("unfiled_____", Folder[needs_merge = true], {
                ("folderBBBBBB", Folder[needs_merge = true], {
                    ("bookmarkDDDD", Bookmark[needs_merge = true]),
                    ("bookmarkAAAA", Bookmark[needs_merge = true]),
                    ("bookmarkCCCC", Bookmark[needs_merge = true])
                })
            }),
            ("toolbar_____", Folder[needs_merge = true], {
                ("folderAAAAAA", Folder, {
                    ("bookmarkFFFF", Bookmark[needs_merge = true]),
                    ("bookmarkEEEE", Bookmark[needs_merge = true])
                })
            })
        }).into_tree().unwrap();

        let mut merger = Merger::new(&local_tree, &remote_tree);
        let merged_root = merger.merge().unwrap();
        assert!(merger.subsumes(&local_tree));
        assert!(merger.subsumes(&remote_tree));

        let expected_tree = nodes!({
            ("unfiled_____", Folder, {
                ("folderBBBBBB", Folder, {
                    ("bookmarkDDDD", Bookmark),
                    ("bookmarkAAAA", Bookmark),
                    ("bookmarkCCCC", Bookmark)
                })
            }),
            ("toolbar_____", Folder, {
                ("folderAAAAAA", Folder, {
                    ("bookmarkEEEE", Bookmark)
                })
            }),
            ("menu________", Folder, {
                ("bookmarkFFFF", Bookmark)
            })
        }).into_tree().unwrap();
        let expected_telem = StructureCounts {
            new: 3,
            remote_revives: 0,
            local_deletes: 0,
            local_revives: 0,
            remote_deletes: 0,
            dupes: 0,
        };

        let merged_tree = merged_root.into_tree().unwrap();
        assert_eq!(merged_tree, expected_tree);

        assert_eq!(merger.deletions().count(), 0);

        assert_eq!(merger.telemetry(), &expected_telem);
    }

    // This test moves a bookmark that exists locally into a new folder that only
    // exists remotely, and is a later sibling of the local parent.
    #[test]
    fn move_into_parent_sibling() {
        before_each();

        let local_tree = nodes!({
            ("menu________", Folder[needs_merge = true], {
                ("folderAAAAAA", Folder[needs_merge = true], {
                    ("bookmarkBBBB", Bookmark[needs_merge = true])
                })
            })
        }).into_tree().unwrap();

        let remote_tree = nodes!({
            ("menu________", Folder[needs_merge = true], {
                ("folderAAAAAA", Folder[needs_merge = true]),
                ("folderCCCCCC", Folder[needs_merge = true], {
                    ("bookmarkBBBB", Bookmark[needs_merge = true])
                })
            })
        }).into_tree().unwrap();

        let mut merger = Merger::new(&local_tree, &remote_tree);
        let merged_root = merger.merge().unwrap();
        assert!(merger.subsumes(&local_tree));
        assert!(merger.subsumes(&remote_tree));

        let expected_tree = nodes!({
            ("menu________", Folder, {
                ("folderAAAAAA", Folder),
                ("folderCCCCCC", Folder, {
                    ("bookmarkBBBB", Bookmark)
                })
            })
        }).into_tree().unwrap();
        let expected_telem = StructureCounts {
            new: 0,
            remote_revives: 0,
            local_deletes: 0,
            local_revives: 0,
            remote_deletes: 0,
            dupes: 0,
        };

        let merged_tree = merged_root.into_tree().unwrap();
        assert_eq!(merged_tree, expected_tree);

        assert_eq!(merger.deletions().count(), 0);

        assert_eq!(merger.telemetry(), &expected_telem);
    }

    #[test]
    fn reorder_and_insert() {
        before_each();

        let shared_tree = nodes!({
            ("menu________", Folder, {
                ("bookmarkAAAA", Bookmark),
                ("bookmarkBBBB", Bookmark),
                ("bookmarkCCCC", Bookmark)
            }),
            ("toolbar_____", Folder, {
                ("bookmarkDDDD", Bookmark),
                ("bookmarkEEEE", Bookmark),
                ("bookmarkFFFF", Bookmark)
            })
        }).into_tree().unwrap();

        let local_tree = nodes!({
            ("menu________", Folder[needs_merge = true], {
                ("bookmarkCCCC", Bookmark),
                ("bookmarkAAAA", Bookmark),
                ("bookmarkBBBB", Bookmark)
            }),
            ("toolbar_____", Folder[needs_merge = true, age = 5], {
                ("bookmarkDDDD", Bookmark),
                ("bookmarkEEEE", Bookmark),
                ("bookmarkFFFF", Bookmark),
                ("bookmarkGGGG", Bookmark[needs_merge = true]),
                ("bookmarkHHHH", Bookmark[needs_merge = true])
            })
        }).into_tree().unwrap();

        let remote_tree = nodes!({
            ("menu________", Folder[needs_merge = true, age = 5], {
                ("bookmarkAAAA", Bookmark[age = 5]),
                ("bookmarkBBBB", Bookmark[age = 5]),
                ("bookmarkCCCC", Bookmark[age = 5]),
                ("bookmarkIIII", Bookmark[needs_merge = true]),
                ("bookmarkJJJJ", Bookmark[needs_merge = true])
            }),
            ("toolbar_____", Folder[needs_merge = true], {
                ("bookmarkFFFF", Bookmark),
                ("bookmarkDDDD", Bookmark),
                ("bookmarkEEEE", Bookmark)
            })
        }).into_tree().unwrap();

        let mut merger = Merger::new(&local_tree, &remote_tree);
        let merged_root = merger.merge().unwrap();
        assert!(merger.subsumes(&local_tree));
        assert!(merger.subsumes(&remote_tree));

        let expected_tree = nodes!({
            ("menu________", Folder, {
                // The server has an older menu, so we should use the local order (C A B)
                // as the base, then append (I J).
                ("bookmarkCCCC", Bookmark[age = 5]),
                ("bookmarkAAAA", Bookmark[age = 5]),
                ("bookmarkBBBB", Bookmark[age = 5]),
                ("bookmarkIIII", Bookmark),
                ("bookmarkJJJJ", Bookmark)
            }),
            ("toolbar_____", Folder[age = 5], {
                // The server has a newer toolbar, so we should use the remote order (F D E)
                // as the base, then append (G H).
                ("bookmarkFFFF", Bookmark),
                ("bookmarkDDDD", Bookmark),
                ("bookmarkEEEE", Bookmark),
                ("bookmarkGGGG", Bookmark),
                ("bookmarkHHHH", Bookmark)
            })
        }).into_tree().unwrap();
        let expected_telem = StructureCounts {
            new: 2,
            remote_revives: 0,
            local_deletes: 0,
            local_revives: 0,
            remote_deletes: 0,
            dupes: 0,
        };

        let merged_tree = merged_root.into_tree().unwrap();
        assert_eq!(merged_tree, expected_tree);

        assert_eq!(merger.deletions().count(), 0);

        assert_eq!(merger.telemetry(), &expected_telem);
    }

    #[test]
    fn value_structure_conflict() {
        before_each();

        let shared_tree = nodes!({
            ("menu________", Folder, {
                ("folderAAAAAA", Folder, {
                    ("bookmarkBBBB", Bookmark),
                    ("bookmarkCCCC", Bookmark)
                }),
                ("folderDDDDDD", Folder, {
                    ("bookmarkEEEE", Bookmark)
                })
            })
        }).into_tree().unwrap();

        let local_tree = nodes!({
            ("menu________", Folder, {
                ("folderAAAAAA", Folder[needs_merge = true, age = 10], {
                    ("bookmarkCCCC", Bookmark)
                }),
                ("folderDDDDDD", Folder[needs_merge = true, age = 10], {
                    ("bookmarkBBBB", Bookmark),
                    ("bookmarkEEEE", Bookmark[age = 10])
                })
            })
        }).into_tree().unwrap();

        let remote_tree = nodes!({
            ("menu________", Folder, {
                ("folderAAAAAA", Folder, {
                    ("bookmarkBBBB", Bookmark),
                    ("bookmarkCCCC", Bookmark)
                }),
                ("folderDDDDDD", Folder[needs_merge = true, age = 5], {
                    ("bookmarkEEEE", Bookmark[needs_merge = true, age = 5])
                })
            })
        }).into_tree().unwrap();

        let mut merger = Merger::new(&local_tree, &remote_tree);
        let merged_root = merger.merge().unwrap();
        assert!(merger.subsumes(&local_tree));
        assert!(merger.subsumes(&remote_tree));

        let expected_tree = nodes!({
            ("menu________", Folder, {
                ("folderAAAAAA", Folder, {
                    ("bookmarkCCCC", Bookmark)
                }),
                ("folderDDDDDD", Folder[age = 5], {
                    ("bookmarkEEEE", Bookmark[age = 5]),
                    ("bookmarkBBBB", Bookmark)
                })
            })
        }).into_tree().unwrap();
        let expected_telem = StructureCounts {
            new: 2,
            remote_revives: 0,
            local_deletes: 0,
            local_revives: 0,
            remote_deletes: 0,
            dupes: 0,
        };

        let merged_tree = merged_root.into_tree().unwrap();
        assert_eq!(merged_tree, expected_tree);

        assert_eq!(merger.deletions().count(), 0);

        assert_eq!(merger.telemetry(), &expected_telem);
    }

    #[test]
    fn complex_move_with_additions() {
        before_each();

        let shared_tree = nodes!({
            ("menu________", Folder, {
                ("folderAAAAAA", Folder, {
                    ("bookmarkBBBB", Bookmark),
                    ("bookmarkCCCC", Bookmark)
                })
            })
        }).into_tree().unwrap();

        let local_tree = nodes!({
            ("menu________", Folder, {
                ("folderAAAAAA", Folder, {
                    ("bookmarkBBBB", Bookmark),
                    ("bookmarkCCCC", Bookmark),
                    ("bookmarkDDDD", Bookmark)
                })
            })
        }).into_tree().unwrap();

        let remote_tree = nodes!({
            ("menu________", Folder, {
                ("bookmarkCCCC", Bookmark)
            }),
            ("toolbar_____", Folder, {
                ("folderAAAAAA", Folder, {
                    ("bookmarkBBBB", Bookmark),
                    ("bookmarkEEEE", Bookmark)
                })
            })
        }).into_tree().unwrap();

        let mut merger = Merger::new(&local_tree, &remote_tree);
        let merged_root = merger.merge().unwrap();
        assert!(merger.subsumes(&local_tree));
        assert!(merger.subsumes(&remote_tree));

        let expected_tree = nodes!({
            ("menu________", Folder, {
                ("bookmarkCCCC", Bookmark)
            }),
            ("toolbar_____", Folder, {
                ("folderAAAAAA", Folder, {
                    // We can guarantee child order (B E D), since we always walk remote
                    // children first, and the remote folder A record is newer than the
                    // local folder. If the local folder were newer, the order would be
                    // (D B E).
                    ("bookmarkBBBB", Bookmark),
                    ("bookmarkEEEE", Bookmark),
                    ("bookmarkDDDD", Bookmark)
                })
            })
        }).into_tree().unwrap();
        let expected_telem = StructureCounts {
            new: 1,
            remote_revives: 0,
            local_deletes: 0,
            local_revives: 0,
            remote_deletes: 0,
            dupes: 0,
        };

        let merged_tree = merged_root.into_tree().unwrap();
        assert_eq!(merged_tree, expected_tree);

        assert_eq!(merger.deletions().count(), 0);

        assert_eq!(merger.telemetry(), &expected_telem);
    }

    #[test]
    fn complex_orphaning() {
        before_each();

        let shared_tree = nodes!({
            ("toolbar_____", Folder, {
                ("folderAAAAAA", Folder, {
                    ("folderBBBBBB", Folder)
                })
            }),
            ("menu________", Folder, {
                ("folderCCCCCC", Folder, {
                    ("folderDDDDDD", Folder, {
                        ("folderEEEEEE", Folder)
                    })
                })
            })
        }).into_tree().unwrap();

        // Locally: delete E, add B > F.
        let mut local_tree = nodes!({
            ("toolbar_____", Folder[needs_merge = false], {
                ("folderAAAAAA", Folder, {
                    ("folderBBBBBB", Folder[needs_merge = true], {
                        ("bookmarkFFFF", Bookmark[needs_merge = true])
                    })
                })
            }),
            ("menu________", Folder, {
                ("folderCCCCCC", Folder, {
                    ("folderDDDDDD", Folder[needs_merge = true])
                })
            })
        }).into_tree().unwrap();
        local_tree.note_deleted("folderEEEEEE".into());

        // Remotely: delete B, add E > G.
        let mut remote_tree = nodes!({
            ("toolbar_____", Folder, {
                ("folderAAAAAA", Folder[needs_merge = true])
            }),
            ("menu________", Folder, {
                ("folderCCCCCC", Folder, {
                    ("folderDDDDDD", Folder, {
                        ("folderEEEEEE", Folder[needs_merge = true], {
                            ("bookmarkGGGG", Bookmark[needs_merge = true])
                        })
                    })
                })
            })
        }).into_tree().unwrap();
        remote_tree.note_deleted("folderBBBBBB".into());

        let mut merger = Merger::new(&local_tree, &remote_tree);
        let merged_root = merger.merge().unwrap();
        assert!(merger.subsumes(&local_tree));
        assert!(merger.subsumes(&remote_tree));

        let expected_tree = nodes!({
            ("toolbar_____", Folder, {
                ("folderAAAAAA", Folder, {
                    // B was deleted remotely, so F moved to A, the closest
                    // surviving parent.
                    ("bookmarkFFFF", Bookmark)
                })
            }),
            ("menu________", Folder, {
                ("folderCCCCCC", Folder, {
                    ("folderDDDDDD", Folder, {
                        // E was deleted locally, so G moved to D.
                        ("bookmarkGGGG", Bookmark)
                    })
                })
            })
        }).into_tree().unwrap();
        let expected_deletions = vec![
            "folderBBBBBB",
            "folderEEEEEE",
        ].into_iter().map(|guid| guid.into()).collect::<Vec<Guid>>();
        let expected_telem = StructureCounts {
            new: 2,
            remote_revives: 0,
            local_deletes: 1,
            local_revives: 0,
            remote_deletes: 1,
            dupes: 0,
        };

        let merged_tree = merged_root.into_tree().unwrap();
        assert_eq!(merged_tree, expected_tree);

        let mut deletions = merger.deletions().map(|d| d.guid).collect::<Vec<Guid>>();
        deletions.sort_unstable();
        assert_eq!(deletions, expected_deletions);

        assert_eq!(merger.telemetry(), &expected_telem);
    }

    #[test]
    fn locally_modified_remotely_deleted() {
        before_each();

        let shared_tree = nodes!({
            ("toolbar_____", Folder, {
                ("folderAAAAAA", Folder, {
                    ("folderBBBBBB", Folder)
                })
            }),
            ("menu________", Folder, {
                ("folderCCCCCC", Folder, {
                    ("folderDDDDDD", Folder, {
                        ("folderEEEEEE", Folder)
                    })
                })
            })
        }).into_tree().unwrap();

        let mut local_tree = nodes!({
            ("toolbar_____", Folder, {
                ("folderAAAAAA", Folder, {
                    ("folderBBBBBB", Folder[needs_merge = true], {
                        ("bookmarkFFFF", Bookmark[needs_merge = true])
                    })
                })
            }),
            ("menu________", Folder, {
                ("folderCCCCCC", Folder, {
                    ("folderDDDDDD", Folder[needs_merge = true])
                })
            })
        }).into_tree().unwrap();
        local_tree.note_deleted("folderEEEEEE".into());

        let mut remote_tree = nodes!({
            ("toolbar_____", Folder, {
                ("folderAAAAAA", Folder[needs_merge = true])
            }),
            ("menu________", Folder, {
                ("folderCCCCCC", Folder, {
                    ("folderDDDDDD", Folder, {
                        ("folderEEEEEE", Folder[needs_merge = true], {
                            ("bookmarkGGGG", Bookmark[needs_merge = true])
                        })
                    })
                })
            })
        }).into_tree().unwrap();
        remote_tree.note_deleted("folderBBBBBB".into());

        let mut merger = Merger::new(&local_tree, &remote_tree);
        let merged_root = merger.merge().unwrap();
        assert!(merger.subsumes(&local_tree));
        assert!(merger.subsumes(&remote_tree));

        let expected_tree = nodes!({
            ("toolbar_____", Folder, {
                ("folderAAAAAA", Folder, {
                    ("bookmarkFFFF", Bookmark)
                })
            }),
            ("menu________", Folder, {
                ("folderCCCCCC", Folder, {
                    ("folderDDDDDD", Folder, {
                        ("bookmarkGGGG", Bookmark)
                    })
                })
            })
        }).into_tree().unwrap();
        let expected_deletions = vec![
            "folderBBBBBB",
            "folderEEEEEE",
        ].into_iter().map(|guid| guid.into()).collect::<Vec<Guid>>();
        let expected_telem = StructureCounts {
            new: 2,
            remote_revives: 0,
            local_deletes: 1,
            local_revives: 0,
            remote_deletes: 1,
            dupes: 0,
        };

        let merged_tree = merged_root.into_tree().unwrap();
        assert_eq!(merged_tree, expected_tree);

        let mut deletions = merger.deletions().map(|d| d.guid).collect::<Vec<Guid>>();
        deletions.sort();
        assert_eq!(deletions, expected_deletions);

        assert_eq!(merger.telemetry(), &expected_telem);
    }

    #[test]
    fn locally_deleted_remotely_modified() {
        before_each();

        let shared_tree = nodes!({
            ("menu________", Folder, {
                ("bookmarkAAAA", Bookmark),
                ("folderBBBBBB", Folder, {
                    ("bookmarkCCCC", Bookmark),
                    ("folderDDDDDD", Folder, {
                        ("bookmarkEEEE", Bookmark)
                    })
                })
            })
        }).into_tree().unwrap();

        let mut local_tree = nodes!({
            ("menu________", Folder[needs_merge = true])
        }).into_tree().unwrap();
        for guid in vec!["bookmarkAAAA", "folderBBBBBB", "bookmarkCCCC", "folderDDDDDD", "bookmarkEEEE"] {
            local_tree.note_deleted(guid.into());
        }

        let remote_tree = nodes!({
            ("menu________", Folder, {
                ("bookmarkAAAA", Bookmark[needs_merge = true]),
                ("folderBBBBBB", Folder[needs_merge = true], {
                    ("bookmarkCCCC", Bookmark),
                    ("folderDDDDDD", Folder[needs_merge = true], {
                        ("bookmarkEEEE", Bookmark),
                        ("bookmarkFFFF", Bookmark[needs_merge = true])
                    }),
                    ("bookmarkGGGG", Bookmark[needs_merge = true])
                })
            })
        }).into_tree().unwrap();

        let mut merger = Merger::new(&local_tree, &remote_tree);
        let merged_root = merger.merge().unwrap();
        assert!(merger.subsumes(&local_tree));
        assert!(merger.subsumes(&remote_tree));

        let expected_tree = nodes!({
            ("menu________", Folder, {
                ("bookmarkAAAA", Bookmark),
                ("bookmarkFFFF", Bookmark),
                ("bookmarkGGGG", Bookmark)
            })
        }).into_tree().unwrap();
        let expected_deletions = vec![
            "bookmarkCCCC",
            "bookmarkEEEE",
            "folderBBBBBB",
            "folderDDDDDD",
        ].into_iter().map(|guid| guid.into()).collect::<Vec<Guid>>();
        let expected_telem = StructureCounts {
            new: 1,
            remote_revives: 1,
            local_deletes: 2,
            local_revives: 0,
            remote_deletes: 0,
            dupes: 0,
        };

        let merged_tree = merged_root.into_tree().unwrap();
        assert_eq!(merged_tree, expected_tree);

        let mut deletions = merger.deletions().map(|d| d.guid).collect::<Vec<Guid>>();
        deletions.sort();
        assert_eq!(deletions, expected_deletions);

        assert_eq!(merger.telemetry(), &expected_telem);
    }

    #[test]
    fn nonexistent_on_one_side() {
        before_each();

        let mut local_tree = Tree::default();
        // A doesn't exist remotely.
        local_tree.note_deleted("bookmarkAAAA".into());

        let mut remote_tree = Tree::default();
        // B doesn't exist locally.
        remote_tree.note_deleted("bookmarkBBBB".into());

        let mut merger = Merger::new(&local_tree, &remote_tree);
        let merged_root = merger.merge().unwrap();
        assert!(merger.subsumes(&local_tree));
        assert!(merger.subsumes(&remote_tree));

        let expected_tree = Tree::default();
        let expected_deletions = vec![
            "bookmarkAAAA",
            "bookmarkBBBB",
        ].into_iter().map(|guid| guid.into()).collect::<Vec<Guid>>();
        let expected_telem = StructureCounts {
            new: 0,
            remote_revives: 0,
            local_deletes: 0,
            local_revives: 0,
            remote_deletes: 0,
            dupes: 0,
        };

        let merged_tree = merged_root.into_tree().unwrap();
        assert_eq!(merged_tree, expected_tree);

        let mut deletions = merger.deletions().map(|d| d.guid).collect::<Vec<Guid>>();
        deletions.sort();
        assert_eq!(deletions, expected_deletions);

        assert_eq!(merger.telemetry(), &expected_telem);
    }

    #[test]
    fn clear_folder_then_delete() {
        before_each();

        let shared_tree = nodes!({
            ("menu________", Folder, {
                ("folderAAAAAA", Folder, {
                    ("bookmarkBBBB", Bookmark),
                    ("bookmarkCCCC", Bookmark)
                }),
                ("folderDDDDDD", Folder, {
                    ("bookmarkEEEE", Bookmark),
                    ("bookmarkFFFF", Bookmark)
                })
            })
        }).into_tree().unwrap();

        let mut local_tree = nodes!({
            ("menu________", Folder[needs_merge = true], {
                ("folderAAAAAA", Folder, {
                    ("bookmarkBBBB", Bookmark),
                    ("bookmarkCCCC", Bookmark)
                }),
                ("bookmarkEEEE", Bookmark[needs_merge = true])
            }),
            ("mobile______", Folder[needs_merge = true], {
                ("bookmarkFFFF", Bookmark[needs_merge = true])
            })
        }).into_tree().unwrap();
        local_tree.note_deleted("folderDDDDDD".into());

        let mut remote_tree = nodes!({
            ("menu________", Folder[needs_merge = true], {
                ("bookmarkBBBB", Bookmark[needs_merge = true]),
                ("folderDDDDDD", Folder, {
                    ("bookmarkEEEE", Bookmark),
                    ("bookmarkFFFF", Bookmark)
                })
            }),
            ("unfiled_____", Folder[needs_merge = true], {
                ("bookmarkCCCC", Bookmark[needs_merge = true])
            })
        }).into_tree().unwrap();
        remote_tree.note_deleted("folderAAAAAA".into());

        let mut merger = Merger::new(&local_tree, &remote_tree);
        let merged_root = merger.merge().unwrap();
        assert!(merger.subsumes(&local_tree));
        assert!(merger.subsumes(&remote_tree));

        let expected_tree = nodes!({
            ("menu________", Folder, {
                ("bookmarkBBBB", Bookmark),
                ("bookmarkEEEE", Bookmark)
            }),
            ("unfiled_____", Folder, {
                ("bookmarkCCCC", Bookmark)
            }),
            ("mobile______", Folder, {
                ("bookmarkFFFF", Bookmark)
            })
        }).into_tree().unwrap();
        let expected_deletions = vec![
            "folderAAAAAA",
            "folderDDDDDD",
        ].into_iter().map(|guid| guid.into()).collect::<Vec<Guid>>();
        let expected_telem = StructureCounts {
            new: 3,
            remote_revives: 0,
            local_deletes: 0,
            local_revives: 0,
            remote_deletes: 0,
            dupes: 0,
        };

        let merged_tree = merged_root.into_tree().unwrap();
        assert_eq!(merged_tree, expected_tree);

        let mut deletions = merger.deletions().map(|d| d.guid).collect::<Vec<Guid>>();
        deletions.sort();
        assert_eq!(deletions, expected_deletions);

        assert_eq!(merger.telemetry(), &expected_telem);
    }

    #[test]
    fn newer_move_to_deleted() {
        before_each();

        let shared_tree = nodes!({
            ("menu________", Folder, {
                ("folderAAAAAA", Folder, {
                    ("bookmarkBBBB", Bookmark)
                }),
                ("folderCCCCCC", Folder, {
                    ("bookmarkDDDD", Bookmark)
                })
            })
        }).into_tree().unwrap();

        let mut local_tree = nodes!({
            ("menu________", Folder[needs_merge = true], {
                // A is younger locally. However, we should *not* revert
                // remotely moving B to the toolbar. (Locally, B exists in A,
                // but we deleted the now-empty A remotely).
                ("folderAAAAAA", Folder[needs_merge = true], {
                    ("bookmarkBBBB", Bookmark[age = 5]),
                    ("bookmarkEEEE", Bookmark[needs_merge = true])
                })
            }),
            ("toolbar_____", Folder[needs_merge = true], {
                ("bookmarkDDDD", Bookmark[needs_merge = true])
            })
        }).into_tree().unwrap();
        local_tree.note_deleted("folderCCCCCC".into());

        let mut remote_tree = nodes!({
            ("menu________", Folder[needs_merge = true, age = 5], {
                // C is younger remotely. However, we should *not* revert
                // locally moving D to the toolbar. (Locally, D exists in C,
                // but we deleted the now-empty C locally).
                ("folderCCCCCC", Folder[needs_merge = true], {
                    ("bookmarkDDDD", Bookmark[age = 5]),
                    ("bookmarkFFFF", Bookmark[needs_merge = true])
                })
            }),
            ("toolbar_____", Folder[needs_merge = true, age = 5], {
                ("bookmarkBBBB", Bookmark[needs_merge = true, age = 5])
            })
        }).into_tree().unwrap();
        remote_tree.note_deleted("folderAAAAAA".into());

        let mut merger = Merger::new(&local_tree, &remote_tree);
        let merged_root = merger.merge().unwrap();
        assert!(merger.subsumes(&local_tree));
        assert!(merger.subsumes(&remote_tree));

        let expected_tree = nodes!({
            ("menu________", Folder, {
                ("bookmarkEEEE", Bookmark),
                ("bookmarkFFFF", Bookmark)
            }),
            ("toolbar_____", Folder, {
                ("bookmarkDDDD", Bookmark[age = 5]),
                ("bookmarkBBBB", Bookmark[age = 5])
            })
        }).into_tree().unwrap();
        let expected_deletions = vec![
            "folderAAAAAA",
            "folderCCCCCC",
        ].into_iter().map(|guid| guid.into()).collect::<Vec<Guid>>();
        let expected_telem = StructureCounts {
            new: 2,
            remote_revives: 0,
            local_deletes: 1,
            local_revives: 0,
            remote_deletes: 1,
            dupes: 0,
        };

        let merged_tree = merged_root.into_tree().unwrap();
        assert_eq!(merged_tree, expected_tree);

        let mut deletions = merger.deletions().map(|d| d.guid).collect::<Vec<Guid>>();
        deletions.sort();
        assert_eq!(deletions, expected_deletions);

        assert_eq!(merger.telemetry(), &expected_telem);
    }

    #[test]
    fn deduping_local_newer() {
        before_each();

        let local_tree = nodes!({
            ("menu________", Folder[needs_merge = true], {
                ("bookmarkAAA1", Bookmark[needs_merge = true]),
                ("bookmarkAAA2", Bookmark[needs_merge = true]),
                ("bookmarkAAA3", Bookmark[needs_merge = true])
            })
        }).into_tree().unwrap();
        let mut new_local_contents: HashMap<Guid, Content> = HashMap::new();
        new_local_contents.insert("bookmarkAAA1".into(),
                                  Content::Bookmark { title: "A".into(),
                                                      url_href: "http://example.com/a".into(), });
        new_local_contents.insert("bookmarkAAA2".into(),
                                  Content::Bookmark { title: "A".into(),
                                                      url_href: "http://example.com/a".into(), });
        new_local_contents.insert("bookmarkAAA3".into(),
                                  Content::Bookmark { title: "A".into(),
                                                      url_href: "http://example.com/a".into(), });

        let remote_tree = nodes!({
            ("menu________", Folder[needs_merge = true, age = 5], {
                ("bookmarkAAAA", Bookmark[needs_merge = true, age = 5]),
                ("bookmarkAAA4", Bookmark[needs_merge = true, age = 5]),
                ("bookmarkAAA5", Bookmark)
            })
        }).into_tree().unwrap();
        let mut new_remote_contents: HashMap<Guid, Content> = HashMap::new();
        new_remote_contents.insert("bookmarkAAAA".into(),
                                   Content::Bookmark { title: "A".into(),
                                                       url_href: "http://example.com/a".into(), });
        new_remote_contents.insert("bookmarkAAA4".into(),
                                   Content::Bookmark { title: "A".into(),
                                                       url_href: "http://example.com/a".into(), });

        let mut merger = Merger::with_contents(&local_tree,
                                               &new_local_contents,
                                               &remote_tree,
                                               &new_remote_contents);
        let merged_root = merger.merge().unwrap();
        assert!(merger.subsumes(&local_tree));
        assert!(merger.subsumes(&remote_tree));

        let expected_tree = nodes!({
            ("menu________", Folder, {
                ("bookmarkAAAA", Bookmark),
                ("bookmarkAAA4", Bookmark),
                ("bookmarkAAA3", Bookmark),
                ("bookmarkAAA5", Bookmark)
            })
        }).into_tree().unwrap();
        let expected_telem = StructureCounts {
            new: 1,
            remote_revives: 0,
            local_deletes: 0,
            local_revives: 0,
            remote_deletes: 0,
            dupes: 2,
        };

        let merged_tree = merged_root.into_tree().unwrap();
        assert_eq!(merged_tree, expected_tree);

        assert_eq!(merger.deletions().count(), 0);

        assert_eq!(merger.telemetry(), &expected_telem);
    }

    #[test]
    fn deduping_remote_newer() {
        before_each();

        let local_tree = nodes!({
            ("menu________", Folder[needs_merge = true, age = 5], {
                // Shouldn't dedupe to `folderAAAAA1` because it's not in
                // `new_local_contents`.
                ("folderAAAAAA", Folder[needs_merge = true, age = 5], {
                    // Shouldn't dedupe to `bookmarkBBB1`. (bookmarkG111)
                    ("bookmarkBBBB", Bookmark[age = 10]),
                    // Not a candidate for `bookmarkCCC1` because the URLs are
                    // different. (bookmarkH111)
                    ("bookmarkCCCC", Bookmark[needs_merge = true, age = 5])
                }),
                // Should dedupe to `folderDDDDD1`. (folderB11111)
                ("folderDDDDDD", Folder[needs_merge = true, age = 5], {
                    // Should dedupe to `bookmarkEEE1`. (bookmarkC222)
                    ("bookmarkEEEE", Bookmark[needs_merge = true, age = 5]),
                    // Should dedupe to `separatorFF1` because the positions are
                    // the same. (separatorF11)
                    ("separatorFFF", Separator[needs_merge = true, age = 5])
                }),
                // Shouldn't dedupe to `separatorGG1`, because the positions are
                // different. (separatorE11)
                ("separatorGGG", Separator[needs_merge = true, age = 5]),
                // Shouldn't dedupe to `bookmarkHHH1` because the parents are
                // different. (bookmarkC222)
                ("bookmarkHHHH", Bookmark[needs_merge = true, age = 5]),
                // Should dedupe to `queryIIIIII1`.
                ("queryIIIIIII", Query[needs_merge = true, age = 5])
            })
        }).into_tree().unwrap();
        let mut new_local_contents: HashMap<Guid, Content> = HashMap::new();
        new_local_contents.insert("bookmarkCCCC".into(),
                                  Content::Bookmark { title: "C".into(),
                                                      url_href: "http://example.com/c".into() });
        new_local_contents.insert("folderDDDDDD".into(),
                                  Content::Folder { title: "D".into() });
        new_local_contents.insert("bookmarkEEEE".into(),
                                  Content::Bookmark { title: "E".into(),
                                                      url_href: "http://example.com/e".into() });
        new_local_contents.insert("separatorFFF".into(), Content::Separator { position: 1 });
        new_local_contents.insert("separatorGGG".into(), Content::Separator { position: 2 });
        new_local_contents.insert("bookmarkHHHH".into(),
                                  Content::Bookmark { title: "H".into(),
                                                      url_href: "http://example.com/h".into() });
        new_local_contents.insert("queryIIIIIII".into(),
                                  Content::Bookmark { title: "I".into(),
                                                      url_href: "place:maxResults=10&sort=8".into() });

        let remote_tree = nodes!({
            ("menu________", Folder[needs_merge = true], {
                ("folderAAAAAA", Folder[needs_merge = true], {
                    ("bookmarkBBBB", Bookmark[age = 10]),
                    ("bookmarkCCC1", Bookmark[needs_merge = true])
                }),
                ("folderDDDDD1", Folder[needs_merge = true], {
                    ("bookmarkEEE1", Bookmark[needs_merge = true]),
                    ("separatorFF1", Separator[needs_merge = true])
                }),
                ("separatorGG1", Separator[needs_merge = true]),
                ("bookmarkHHH1", Bookmark[needs_merge = true]),
                ("queryIIIIII1", Query[needs_merge = true])
            })
        }).into_tree().unwrap();
        let mut new_remote_contents: HashMap<Guid, Content> = HashMap::new();
        new_remote_contents.insert("bookmarkCCC1".into(),
                                   Content::Bookmark { title: "C".into(),
                                                       url_href: "http://example.com/c1".into() });
        new_remote_contents.insert("folderDDDDD1".into(),
                                   Content::Folder { title: "D".into() });
        new_remote_contents.insert("bookmarkEEE1".into(),
                                   Content::Bookmark { title: "E".into(),
                                                       url_href: "http://example.com/e".into() });
        new_remote_contents.insert("separatorFF1".into(), Content::Separator { position: 1 });
        new_remote_contents.insert("separatorGG1".into(), Content::Separator { position: 2 });
        new_remote_contents.insert("bookmarkHHH1".into(),
                                   Content::Bookmark { title: "H".into(),
                                                       url_href: "http://example.com/h".into() });
        new_remote_contents.insert("queryIIIIII1".into(),
                                   Content::Bookmark { title: "I".into(),
                                                       url_href: "place:maxResults=10&sort=8".into() });

        let mut merger = Merger::with_contents(&local_tree,
                                               &new_local_contents,
                                               &remote_tree,
                                               &new_remote_contents);
        let merged_root = merger.merge().unwrap();
        assert!(merger.subsumes(&local_tree));
        assert!(merger.subsumes(&remote_tree));

        let expected_tree = nodes!({
            ("menu________", Folder[age = 5], {
                ("folderAAAAAA", Folder, {
                    ("bookmarkBBBB", Bookmark[age = 10]),
                    ("bookmarkCCC1", Bookmark),
                    ("bookmarkCCCC", Bookmark[age = 5])
                }),
                ("folderDDDDD1", Folder, {
                    ("bookmarkEEE1", Bookmark),
                    ("separatorFF1", Separator)
                }),
                ("separatorGG1", Separator),
                ("bookmarkHHH1", Bookmark),
                ("queryIIIIII1", Query)
            })
        }).into_tree().unwrap();
        let expected_telem = StructureCounts {
            new: 1,
            remote_revives: 0,
            local_deletes: 0,
            local_revives: 0,
            remote_deletes: 0,
            dupes: 6,
        };

        let merged_tree = merged_root.into_tree().unwrap();
        assert_eq!(merged_tree, expected_tree);

        assert_eq!(merger.deletions().count(), 0);

        assert_eq!(merger.telemetry(), &expected_telem);
    }

    #[test]
    fn complex_deduping() {
        before_each();

        let local_tree = nodes!({
            ("menu________", Folder[needs_merge = true], {
                ("folderAAAAAA", Folder[needs_merge = true, age = 10], {
                    ("bookmarkBBBB", Bookmark[needs_merge = true, age = 10]),
                    ("bookmarkCCCC", Bookmark[needs_merge = true, age = 10])
                }),
                ("folderDDDDDD", Folder[needs_merge = true], {
                    ("bookmarkEEEE", Bookmark[needs_merge = true, age = 5])
                }),
                ("folderFFFFFF", Folder[needs_merge = true, age = 5], {
                    ("bookmarkGGGG", Bookmark[needs_merge = true, age = 5])
                })
            })
        }).into_tree().unwrap();
        let mut new_local_contents: HashMap<Guid, Content> = HashMap::new();
        new_local_contents.insert("folderAAAAAA".into(),
                                  Content::Folder { title: "A".into() });
        new_local_contents.insert("bookmarkBBBB".into(),
                                  Content::Bookmark { title: "B".into(),
                                                      url_href: "http://example.com/b".into() });
        new_local_contents.insert("bookmarkCCCC".into(),
                                  Content::Bookmark { title: "C".into(),
                                                      url_href: "http://example.com/c".into() });
        new_local_contents.insert("folderDDDDDD".into(),
                                  Content::Folder { title: "D".into() });
        new_local_contents.insert("bookmarkEEEE".into(),
                                  Content::Bookmark { title: "E".into(),
                                                      url_href: "http://example.com/e".into() });
        new_local_contents.insert("folderFFFFFF".into(),
                                  Content::Folder { title: "F".into() });
        new_local_contents.insert("bookmarkGGGG".into(),
                                  Content::Bookmark { title: "G".into(),
                                                      url_href: "http://example.com/g".into() });

        let remote_tree = nodes!({
            ("menu________", Folder[needs_merge = true], {
                ("folderAAAAA1", Folder[needs_merge = true], {
                    ("bookmarkBBB1", Bookmark[needs_merge = true])
                }),
                ("folderDDDDD1", Folder[needs_merge = true, age = 5], {
                    ("bookmarkEEE1", Bookmark[needs_merge = true])
                }),
                ("folderFFFFF1", Folder[needs_merge = true], {
                    ("bookmarkGGG1", Bookmark[needs_merge = true, age = 5]),
                    ("bookmarkHHH1", Bookmark[needs_merge = true])
                })
            })
        }).into_tree().unwrap();
        let mut new_remote_contents: HashMap<Guid, Content> = HashMap::new();
        new_remote_contents.insert("folderAAAAA1".into(),
                                   Content::Folder { title: "A".into() });
        new_remote_contents.insert("bookmarkBBB1".into(),
                                   Content::Bookmark { title: "B".into(),
                                                       url_href: "http://example.com/b".into() });
        new_remote_contents.insert("folderDDDDD1".into(),
                                   Content::Folder { title: "D".into() });
        new_remote_contents.insert("bookmarkEEE1".into(),
                                   Content::Bookmark { title: "E".into(),
                                                       url_href: "http://example.com/e".into() });
        new_remote_contents.insert("folderFFFFF1".into(),
                                   Content::Folder { title: "F".into() });
        new_remote_contents.insert("bookmarkGGG1".into(),
                                   Content::Bookmark { title: "G".into(),
                                                       url_href: "http://example.com/g".into() });
        new_remote_contents.insert("bookmarkHHH1".into(),
                                   Content::Bookmark { title: "H".into(),
                                                       url_href: "http://example.com/h".into() });

        let mut merger = Merger::with_contents(&local_tree,
                                               &new_local_contents,
                                               &remote_tree,
                                               &new_remote_contents);
        let merged_root = merger.merge().unwrap();
        assert!(merger.subsumes(&local_tree));
        assert!(merger.subsumes(&remote_tree));

        let expected_tree = nodes!({
            ("menu________", Folder, {
                ("folderAAAAA1", Folder, {
                    ("bookmarkBBB1", Bookmark),
                    ("bookmarkCCCC", Bookmark[age = 10])
                }),
                ("folderDDDDD1", Folder, {
                    ("bookmarkEEE1", Bookmark)
                }),
                ("folderFFFFF1", Folder, {
                    ("bookmarkGGG1", Bookmark[age = 5]),
                    ("bookmarkHHH1", Bookmark)
                })
            })
        }).into_tree().unwrap();
        let expected_telem = StructureCounts {
            new: 1,
            remote_revives: 0,
            local_deletes: 0,
            local_revives: 0,
            remote_deletes: 0,
            dupes: 6,
        };

        let merged_tree = merged_root.into_tree().unwrap();
        assert_eq!(merged_tree, expected_tree);

        assert_eq!(merger.deletions().count(), 0);

        assert_eq!(merger.telemetry(), &expected_telem);
    }

    #[test]
    fn left_pane_root() {
        before_each();

        let local_tree = Tree::default();

        let remote_tree = nodes!({
            ("folderLEFTPR", Folder[needs_merge = true], {
                ("folderLEFTPQ", Query[needs_merge = true]),
                ("folderLEFTPF", Folder[needs_merge = true], {
                    ("folderLEFTPC", Query[needs_merge = true])
                })
            })
        }).into_tree().unwrap();

        let mut merger = Merger::new(&local_tree, &remote_tree);
        let merged_root = merger.merge().unwrap();
        assert!(merger.subsumes(&local_tree));
        assert!(merger.subsumes(&remote_tree));

        let expected_tree = Tree::default();
        let expected_deletions = vec![
            "folderLEFTPC",
            "folderLEFTPF",
            "folderLEFTPQ",
            "folderLEFTPR",
        ].into_iter().map(|guid| guid.into()).collect::<Vec<Guid>>();
        let expected_telem = StructureCounts {
            new: 1,
            remote_revives: 0,
            local_deletes: 0,
            local_revives: 0,
            remote_deletes: 0,
            dupes: 0,
        };

        let merged_tree = merged_root.into_tree().unwrap();
        assert_eq!(merged_tree, expected_tree);

        let mut deletions = merger.deletions().map(|d| d.guid).collect::<Vec<Guid>>();
        deletions.sort();
        assert_eq!(deletions, expected_deletions);

        assert_eq!(merger.telemetry(), &expected_telem);
    }

    #[test]
    fn non_syncable_items() {
        before_each();

        let local_tree = nodes!({
            ("menu________", Folder[needs_merge = true], {
                // A is non-syncable remotely, but B doesn't exist remotely, so
                // we'll remove A from the merged structure, and move B to the
                // menu.
                ("folderAAAAAA", Folder[needs_merge = true], {
                    ("bookmarkBBBB", Bookmark[needs_merge = true])
                })
            }),
            ("unfiled_____", Folder, {
                // Orphaned left pane queries.
                ("folderLEFTPQ", Query),
                ("folderLEFTPC", Query)
            }),
            ("rootCCCCCCCC", Folder, {
                // Non-syncable local root and children.
                ("folderDDDDDD", Folder, {
                    ("bookmarkEEEE", Bookmark)
                }),
                ("bookmarkFFFF", Bookmark)
            })
        }).into_tree().unwrap();

        let remote_tree = nodes!({
            ("unfiled_____", Folder[needs_merge = true], {
                // D, J, and G are syncable remotely, but D is non-syncable
                // locally. Since J and G don't exist locally, and are syncable
                // remotely, we'll remove D, and move J and G to unfiled.
                ("folderDDDDDD", Folder[needs_merge = true], {
                    ("bookmarkJJJJ", Bookmark[needs_merge = true])
                }),
                ("bookmarkGGGG", Bookmark)
            }),
            ("rootHHHHHHHH", Folder[needs_merge = true], {
                // H is a non-syncable root that only exists remotely. A is
                // non-syncable remotely, and syncable locally. We should
                // remove A and its descendants locally, since its parent
                // H is known to be non-syncable remotely.
                ("folderAAAAAA", Folder, {
                    // F exists in two different non-syncable folders: C
                    // locally, and A remotely.
                    ("bookmarkFFFF", Bookmark),
                    ("bookmarkIIII", Bookmark)
                })
            }),
            ("folderLEFTPR", Folder[needs_merge = true], {
                // The complete left pane root. We should remove all left pane
                // queries locally, even though they're syncable, since the left
                // pane root is known to be non-syncable.
                ("folderLEFTPQ", Query[needs_merge = true]),
                ("folderLEFTPF", Folder[needs_merge = true], {
                    ("folderLEFTPC", Query[needs_merge = true])
                })
            })
        }).into_tree().unwrap();

        let mut merger = Merger::new(&local_tree, &remote_tree);
        let merged_root = merger.merge().unwrap();
        assert!(merger.subsumes(&local_tree));
        assert!(merger.subsumes(&remote_tree));

        let expected_tree = nodes!({
            ("unfiled_____", Folder, {
                ("bookmarkJJJJ", Bookmark),
                ("bookmarkGGGG", Bookmark)
            }),
            ("menu________", Folder, {
                ("bookmarkBBBB", Bookmark)
            })
        }).into_tree().unwrap();
        let expected_deletions = vec![
            "bookmarkEEEE", // Non-syncable locally.
            "bookmarkFFFF", // Non-syncable locally.
            "bookmarkIIII", // Non-syncable remotely.
            "folderAAAAAA", // Non-syncable remotely.
            "folderDDDDDD", // Non-syncable locally.
            "folderLEFTPC", // Non-syncable remotely.
            "folderLEFTPF", // Non-syncable remotely.
            "folderLEFTPQ", // Non-syncable remotely.
            "folderLEFTPR", // Non-syncable remotely.
            "rootCCCCCCCC", // Non-syncable locally.
            "rootHHHHHHHH", // Non-syncable remotely.
        ].into_iter().map(|guid| guid.into()).collect::<Vec<Guid>>();
        let expected_telem = StructureCounts {
            new: 3,
            remote_revives: 0,
            local_deletes: 0,
            local_revives: 0,
            remote_deletes: 0,
            dupes: 0,
        };

        let merged_tree = merged_root.into_tree().unwrap();
        assert_eq!(merged_tree, expected_tree);

        let mut deletions = merger.deletions().map(|d| d.guid).collect::<Vec<Guid>>();
        deletions.sort();
        assert_eq!(deletions, expected_deletions);

        assert_eq!(merger.telemetry(), &expected_telem);
    }

    #[test]
    fn applying_two_empty_folders_doesnt_smush() {
        before_each();

        let local_tree = Tree::default();

        let remote_tree = nodes!({
            ("mobile______", Folder[needs_merge = true], {
                ("emptyempty01", Folder[needs_merge = true]),
                ("emptyempty02", Folder[needs_merge = true])
            })
        }).into_tree().unwrap();

        let mut merger = Merger::new(&local_tree, &remote_tree);
        let merged_root = merger.merge().unwrap();
        assert!(merger.subsumes(&local_tree));
        assert!(merger.subsumes(&remote_tree));

        let expected_tree = nodes!({
            ("mobile______", Folder, {
                ("emptyempty01", Folder),
                ("emptyempty02", Folder)
            })
        }).into_tree().unwrap();
        let expected_telem = StructureCounts {
            new: 0,
            remote_revives: 0,
            local_deletes: 0,
            local_revives: 0,
            remote_deletes: 0,
            dupes: 0,
        };

        let merged_tree = merged_root.into_tree().unwrap();
        assert_eq!(merged_tree, expected_tree);

        assert_eq!(merger.deletions().count(), 0);

        assert_eq!(merger.telemetry(), &expected_telem);
    }

    #[test]
    fn applying_two_empty_folders_matches_only_one() {
        before_each();

        let local_tree = nodes!({
            ("mobile______", Folder[needs_merge = true], {
                ("emptyempty02", Folder[needs_merge = true]),
                ("emptyemptyL0", Folder[needs_merge = true])
            })
        }).into_tree().unwrap();
        let mut new_local_contents: HashMap<Guid, Content> = HashMap::new();
        new_local_contents.insert("emptyempty02".into(),
                                  Content::Folder { title: "Empty".into() });
        new_local_contents.insert("emptyemptyL0".into(),
                                  Content::Folder { title: "Empty".into() });

        let remote_tree = nodes!({
            ("mobile______", Folder[needs_merge = true], {
                ("emptyempty01", Folder[needs_merge = true]),
                ("emptyempty02", Folder[needs_merge = true]),
                ("emptyempty03", Folder[needs_merge = true])
            })
        }).into_tree().unwrap();
        let mut new_remote_contents: HashMap<Guid, Content> = HashMap::new();
        new_remote_contents.insert("emptyempty01".into(),
                                   Content::Folder { title: "Empty".into() });
        new_remote_contents.insert("emptyempty02".into(),
                                   Content::Folder { title: "Empty".into() });
        new_remote_contents.insert("emptyempty03".into(),
                                   Content::Folder { title: "Empty".into() });

        let mut merger = Merger::with_contents(&local_tree,
                                               &new_local_contents,
                                               &remote_tree,
                                               &new_remote_contents);
        let merged_root = merger.merge().unwrap();
        assert!(merger.subsumes(&local_tree));
        assert!(merger.subsumes(&remote_tree));

        let expected_tree = nodes!({
            ("mobile______", Folder, {
                ("emptyempty01", Folder),
                ("emptyempty02", Folder),
                ("emptyempty03", Folder)
            })
        }).into_tree().unwrap();
        let expected_telem = StructureCounts {
            new: 0,
            remote_revives: 0,
            local_deletes: 0,
            local_revives: 0,
            remote_deletes: 0,
            dupes: 1,
        };

        let merged_tree = merged_root.into_tree().unwrap();
        assert_eq!(merged_tree, expected_tree);

        assert_eq!(merger.deletions().count(), 0);

        assert_eq!(merger.telemetry(), &expected_telem);
    }

    // Bug 747699: we should follow the hierarchy when merging, instead of
    // deduping by parent title.
    #[test]
    fn deduping_ignores_parent_title() {
        before_each();

        let local_tree = nodes!({
            ("mobile______", Folder[needs_merge = true], {
                ("bookmarkAAA1", Bookmark[needs_merge = true])
            })
        }).into_tree().unwrap();
        let mut new_local_contents: HashMap<Guid, Content> = HashMap::new();
        new_local_contents.insert("mobile______".into(),
                                  Content::Folder { title: "Favoritos do celular".into() });
        new_local_contents.insert("bookmarkAAA1".into(),
                                  Content::Bookmark { title: "A".into(),
                                                      url_href: "http://example.com/a".into() });

        let remote_tree = nodes!({
            ("mobile______", Folder[needs_merge = true], {
                ("bookmarkAAAA", Bookmark[needs_merge = true])
            })
        }).into_tree().unwrap();
        let mut new_remote_contents: HashMap<Guid, Content> = HashMap::new();
        new_remote_contents.insert("mobile______".into(),
                                   Content::Folder { title: "Mobile Bookmarks".into() });
        new_remote_contents.insert("bookmarkAAAA".into(),
                                   Content::Bookmark { title: "A".into(),
                                                       url_href: "http://example.com/a".into() });

        let mut merger = Merger::with_contents(&local_tree,
                                               &new_local_contents,
                                               &remote_tree,
                                               &new_remote_contents);
        let merged_root = merger.merge().unwrap();
        assert!(merger.subsumes(&local_tree));
        assert!(merger.subsumes(&remote_tree));

        let expected_tree = nodes!({
            ("mobile______", Folder, {
                ("bookmarkAAAA", Bookmark)
            })
        }).into_tree().unwrap();
        let expected_telem = StructureCounts {
            new: 0,
            remote_revives: 0,
            local_deletes: 0,
            local_revives: 0,
            remote_deletes: 0,
            dupes: 1,
        };

        let merged_tree = merged_root.into_tree().unwrap();
        assert_eq!(merged_tree, expected_tree);

        assert_eq!(merger.deletions().count(), 0);

        assert_eq!(merger.telemetry(), &expected_telem);
    }

    #[test]
    fn mismatched_compatible_bookmark_kinds() {
        before_each();

        let local_tree = nodes!({
            ("menu________", Folder[needs_merge = true], {
                ("queryAAAAAAA", Query[needs_merge = true]),
                ("bookmarkBBBB", Bookmark[needs_merge = true, age = 5])
            })
        }).into_tree().unwrap();

        let remote_tree = nodes!({
            ("menu________", Folder[needs_merge = true], {
                ("queryAAAAAAA", Bookmark[needs_merge = true, age = 5]),
                ("bookmarkBBBB", Query[needs_merge = true])
            })
        }).into_tree().unwrap();

        let mut merger = Merger::new(&local_tree, &remote_tree);
        let merged_root = merger.merge().unwrap();
        assert!(merger.subsumes(&local_tree));
        assert!(merger.subsumes(&remote_tree));

        let expected_tree = nodes!({
            ("menu________", Folder, {
                ("queryAAAAAAA", Query),
                ("bookmarkBBBB", Query)
            })
        }).into_tree().unwrap();
        let expected_telem = StructureCounts {
            new: 0,
            remote_revives: 0,
            local_deletes: 0,
            local_revives: 0,
            remote_deletes: 0,
            dupes: 0,
        };

        let merged_tree = merged_root.into_tree().unwrap();
        assert_eq!(merged_tree, expected_tree);

        assert_eq!(merger.deletions().count(), 0);

        assert_eq!(merger.telemetry(), &expected_telem);
    }

    #[test]
    fn mismatched_incompatible_bookmark_kinds() {
        before_each();

        let local_tree = nodes!({
            ("menu________", Folder[needs_merge = true], {
                ("bookmarkAAAA", Bookmark[needs_merge = true])
            })
        }).into_tree().unwrap();

        let remote_tree = nodes!({
            ("menu________", Folder[needs_merge = true], {
                ("bookmarkAAAA", Folder[needs_merge = true, age = 5])
            })
        }).into_tree().unwrap();

        let mut merger = Merger::new(&local_tree, &remote_tree);
        match merger.merge() {
            Ok(_) => panic!("Should not merge trees with mismatched kinds"),
            Err(err) => {
                match err.kind() {
                    ErrorKind::MismatchedItemKind { .. } => {},
                    kind => panic!("Got {:?} merging trees with mismatched kinds", kind)
                };
            }
        };
    }

    #[test]
    fn invalid_guids() {
        before_each();

        let local_tree = nodes!({
            ("toolbar_____", Folder[needs_merge = true, age = 5], {
                ("bookmarkAAAA", Bookmark[needs_merge = true, age = 5]),
                ("bookmarkBBBB", Bookmark[needs_merge = true, age = 5])
            }),
            ("menu________", Folder[needs_merge = true], {
                ("shortGUID", Bookmark[needs_merge = true]),
                ("loooooongGUID", Bookmark[needs_merge = true])
            })
        }).into_tree().unwrap();

        let remote_tree = nodes!({
            ("toolbar_____", Folder[needs_merge = true, age = 5], {
                ("!@#$%^", Bookmark[needs_merge = true, age = 5]),
                ("shortGUID", Bookmark[needs_merge = true, age = 5]),
                ("", Bookmark[needs_merge = true, age = 5]),
                ("loooooongGUID", Bookmark[needs_merge = true, age = 5])
            }),
            ("menu________", Folder[needs_merge = true], {
                ("bookmarkAAAA", Bookmark[needs_merge = true]),
                ("bookmarkBBBB", Bookmark[needs_merge = true])
            })
        }).into_tree().unwrap();

        let mut merger = Merger::new(&local_tree, &remote_tree);
        let merged_root = merger.merge().unwrap();
        assert!(merger.subsumes(&local_tree));
        assert!(merger.subsumes(&remote_tree));

        let expected_tree = nodes!({
            ("toolbar_____", Folder[age = 5], {
                ("!@#$%^", Bookmark[age = 5]),
                ("", Bookmark[age = 5])
            }),
            ("menu________", Folder, {
                ("bookmarkAAAA", Bookmark),
                ("bookmarkBBBB", Bookmark),
                ("shortGUID", Bookmark),
                ("loooooongGUID", Bookmark)
            })
        }).into_tree().unwrap();
        let expected_telem = StructureCounts {
            new: 2,
            remote_revives: 0,
            local_deletes: 0,
            local_revives: 0,
            remote_deletes: 0,
            dupes: 0,
        };

        let merged_tree = merged_root.into_tree().unwrap();
        assert_eq!(merged_tree, expected_tree);

        assert_eq!(merger.deletions().count(), 0);

        assert_eq!(merger.telemetry(), &expected_telem);
    }
}