Roll ICU and convert include style to standard Chromium style,

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>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
+#include "third_party/icu/public/i18n/unicode/coll.h"
 #include "ui/base/ui_export.h"
-#include "unicode/coll.h"
 
 namespace l10n_util {
 
 // Compares the two strings using the specified collator.
 UI_EXPORT UCollationResult CompareString16WithCollator(
     const icu::Collator* collator,
     const string16& lhs,
     const string16& rhs);
 
 // Used by SortStringsUsingMethod. Invokes a method on the objects passed to
@@ skipping 120 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_