Move StringComparator<string16>::operator() to header

ui/base/l10n/l10n_util_collator.h

 // Copyright (c) 2011 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 UI_BASE_L10N_L10N_UTIL_COLLATOR_H_
 #define UI_BASE_L10N_L10N_UTIL_COLLATOR_H_
 
 #include <algorithm>
 #include <functional>
 #include <string>
@@ skipping 88 matching lines @@
 
     return StringComparator<base::string16>(collator_)(lhs_string_key,
                                                  rhs_string_key);
   }
 
  private:
   icu::Collator* collator_;
 };
 
 // Specialization of operator() method for base::string16 version.
-template <> UI_BASE_EXPORT
-bool StringComparator<base::string16>::operator()(const base::string16& lhs,
-                                                  const base::string16& rhs);
+template <>
+UI_BASE_EXPORT inline bool StringComparator<base::string16>::operator()(
+    const base::string16& lhs,
+    const base::string16& rhs) {
+  // If we can not get collator instance for specified locale, just do simple
+  // string compare.
+  if (!collator_)
+    return lhs < rhs;
+  return base::i18n::CompareString16WithCollator(collator_, lhs, rhs) ==
+      UCOL_LESS;
+}
 
 // In place sorting of |elements| of a vector according to the string key of
 // each element in the vector by using collation rules for |locale|.
 // |begin_index| points to the start position of elements in the vector which
 // want to be sorted. |end_index| points to the end position of elements in the
 // vector which want to be sorted
 template <class Element>
 void SortVectorWithStringKey(const std::string& locale,
                              std::vector<Element>* elements,
                              unsigned int begin_index,
@@ skipping 20 matching lines @@
 void SortVectorWithStringKey(const std::string& locale,
                              std::vector<Element>* elements,
                              bool needs_stable_sort) {
   SortVectorWithStringKey<Element>(locale, elements, 0, elements->size(),
                                    needs_stable_sort);
 }
 
 }  // namespace l10n_util
 
 #endif  // UI_BASE_L10N_L10N_UTIL_COLLATOR_H_