autocomplete: Add AutocompleteMatch::MergeClassifications()

chrome/browser/autocomplete/autocomplete_match_unittest.cc

Index: chrome/browser/autocomplete/autocomplete_match_unittest.cc
diff --git a/chrome/browser/autocomplete/autocomplete_match_unittest.cc b/chrome/browser/autocomplete/autocomplete_match_unittest.cc
index b8fe4ed61b35c9f25026e51c2e8a72168ed706e8..057cd8f07e4c7bf87172eb0de4ccb345e549216f 100644
--- a/chrome/browser/autocomplete/autocomplete_match_unittest.cc
+++ b/chrome/browser/autocomplete/autocomplete_match_unittest.cc
@@ -31,3 +31,31 @@ TEST(AutocompleteMatchTest, MoreRelevant) {
               AutocompleteMatch::MoreRelevant(m1, m2));
   }
 }
+
+TEST(AutocompleteMatchTest, MergeClassifications) {
+  EXPECT_EQ("0,3," "1,2",
+      AutocompleteMatch::ClassificationsToString(
+          AutocompleteMatch::MergeClassifications(
+              AutocompleteMatch::ClassificationsFromString("0,1," "1,0"),
+              AutocompleteMatch::ClassificationsFromString("0,2"))));
+
+  EXPECT_EQ("0,3," "1,2",
+      AutocompleteMatch::ClassificationsToString(
+          AutocompleteMatch::MergeClassifications(
+              AutocompleteMatch::ClassificationsFromString("0,2"),
+              AutocompleteMatch::ClassificationsFromString("0,1," "1,0"))));
+
+  EXPECT_EQ("0,3",
+      AutocompleteMatch::ClassificationsToString(
+          AutocompleteMatch::MergeClassifications(
+              AutocompleteMatch::ClassificationsFromString("0,1," "1,2"),
+              AutocompleteMatch::ClassificationsFromString("0,2," "1,1"))));
+
+  EXPECT_EQ("0,2," "1,0," "2,1," "4,3," "5,7," "6,3," "7,7," "15,1," "17,0",
+      AutocompleteMatch::ClassificationsToString(
+          AutocompleteMatch::MergeClassifications(
+              AutocompleteMatch::ClassificationsFromString(
+                  "0,0," "2,1," "4,3," "7,7," "10,6," "15,0"),
+              AutocompleteMatch::ClassificationsFromString(
+                  "0,2," "1,0," "5,7," "6,1," "17,0"))));
+}