Clean up ShortcutsProvider and related classes.

chrome/browser/autocomplete/autocomplete_match.h

 // 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.
 
 #ifndef CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_MATCH_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_MATCH_H_
 #pragma once
 
 #include <vector>
 #include <string>
@@ skipping 116 matching lines @@
   // Similar to ClassifyMatchInString(), but for cases where the range to mark
   // as matching is already known (avoids calling find()).  This can be helpful
   // when find() would be misleading (e.g. you want to mark the second match in
   // a string instead of the first).
   static void ClassifyLocationInString(size_t match_location,
                                        size_t match_length,
                                        size_t overall_length,
                                        int style,
                                        ACMatchClassifications* classifications);
 
+  // Converts classifications to and from a serialized string representation
+  // (using comma-separated integers to sequentially list positions and styles).
+  static std::string ClassificationsToString(
+      const ACMatchClassifications& classifications);
+  static ACMatchClassifications ClassificationsFromString(
+      const std::string& serialized_classifications);
+
+  // Adds a classification to the end of |classifications| iff its style is
+  // different from the last existing classification.  |offset| must be larger
+  // than the offset of the last classification in |classifications|.
+  static void AddLastClassificationIfNecessary(
+      ACMatchClassifications* classifications,
+      size_t offset,
+      int style);
+
   // Removes invalid characters from |text|. Should be called on strings coming
   // from external sources (such as extensions) before assigning to |contents|
   // or |description|.
   static string16 SanitizeString(const string16& text);
 
   // Copies the destination_url with "www." stripped off to
   // |stripped_destination_url|.  This method is invoked internally by the
   // AutocompleteController and does not normally need to be invoked.
   void ComputeStrippedDestinationURL();
 
@@ skipping 110 matching lines @@
   void ValidateClassifications(
       const string16& text,
       const ACMatchClassifications& classifications) const;
 #endif
 };
 
 typedef AutocompleteMatch::ACMatchClassification ACMatchClassification;
 typedef std::vector<ACMatchClassification> ACMatchClassifications;
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_MATCH_H_