autocomplete: Add AutocompleteMatch::MergeClassifications()

chrome/browser/autocomplete/shortcuts_provider_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/autocomplete/shortcuts_provider.h"
 
 #include <math.h>
 
 #include <algorithm>
 #include <functional>
@@ skipping 488 matching lines @@
   EXPECT_EQ(ACMatchClassification::URL | ACMatchClassification::MATCH,
             spans_i[3].style);
   EXPECT_EQ(17U, spans_i[4].offset);
   EXPECT_EQ(ACMatchClassification::URL, spans_i[4].style);
 
   // Some web sites do not have a description, so second and third parameters in
   // ClassifyAllMatchesInString could be empty.
   // 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();
   matches.push_back(ACMatchClassification(0, ACMatchClassification::DIM));
   matches.push_back(ACMatchClassification(9, ACMatchClassification::NONE));
   ClassifyTest classify_test6(ASCIIToUTF16("html password example"), matches);
 
   // Extra space in the next string avoids having the string be a prefix of the
   // text above, which would allow for two different valid classification sets,
   // one of which uses two spans (the first of which would mark all of "html
@@ skipping 145 matching lines @@
 
   match.destination_url = GURL(shortcuts_to_test_delete[2].url);
   match.contents = ASCIIToUTF16(shortcuts_to_test_delete[2].contents);
   match.description = ASCIIToUTF16(shortcuts_to_test_delete[2].description);
 
   provider_->DeleteMatch(match);
   EXPECT_EQ(original_shortcuts_count, backend_->shortcuts_map().size());
   EXPECT_TRUE(backend_->shortcuts_map().end() ==
               backend_->shortcuts_map().find(ASCIIToUTF16("delete")));
 }