autocomplete: Add AutocompleteMatch::MergeClassifications()

chrome/browser/autocomplete/shortcuts_provider_unittest.cc

Index: chrome/browser/autocomplete/shortcuts_provider_unittest.cc
diff --git a/chrome/browser/autocomplete/shortcuts_provider_unittest.cc b/chrome/browser/autocomplete/shortcuts_provider_unittest.cc
index 85a6524ca8dad436a84c786511634fbb3cc828ad..740846ed65874a239916e7b86727fda49311afe2 100644
--- a/chrome/browser/autocomplete/shortcuts_provider_unittest.cc
+++ b/chrome/browser/autocomplete/shortcuts_provider_unittest.cc
@@ -506,7 +506,10 @@ TEST_F(ShortcutsProviderTest, ClassifyAllMatchesInString) {
   // Extra parens in the next line hack around C++03's "most vexing parse".
   class ClassifyTest classify_test5((string16()), ACMatchClassifications());
   ACMatchClassifications spans_j = classify_test5.RunTest(ASCIIToUTF16("man"));
-  ASSERT_EQ(0U, spans_j.size());
+  ASSERT_EQ(1U, spans_j.size());
+  EXPECT_EQ(0U, spans_j.front().offset);
+  EXPECT_EQ(AutocompleteMatch::ACMatchClassification::NONE,
+      spans_j.front().style);
 
   // Matches which end at beginning of classification merge properly.
   matches.clear();