Roll ICU and convert include style to standard Chromium style,

base/i18n/file_util_icu.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.
 
 // File utilities that use the ICU library go in this file.
 
 #include "base/i18n/file_util_icu.h"
 
 #include "base/file_path.h"
 #include "base/i18n/icu_string_conversions.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/sys_string_conversions.h"
 #include "build/build_config.h"
-#include "unicode/coll.h"
-#include "unicode/uniset.h"
+#include "third_party/icu/public/common/unicode/uniset.h"
+#include "third_party/icu/public/i18n/unicode/coll.h"
 
 namespace {
 
 class IllegalCharacters {
  public:
   static IllegalCharacters* GetInstance() {
     return Singleton<IllegalCharacters>::get();
   }
 
   bool contains(UChar32 ucs4) {
@@ skipping 175 matching lines @@
   std::string normalized_str;
   if (base::ConvertToUtf8AndNormalize(file_name->BaseName().value(),
                                       base::kCodepageUTF8,
                                       &normalized_str)) {
     *file_name = file_name->DirName().Append(FilePath(normalized_str));
   }
 #endif
 }
 
 }  // namespace