FTP: improve character encoding detection in cases where ICU's first guess is wrong.

base/i18n/icu_encoding_detection.h

 // Copyright (c) 2010 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 BASE_I18N_ICU_ENCODING_DETECTION_H_
 #define BASE_I18N_ICU_ENCODING_DETECTION_H_
 #pragma once
 
 #include <string>
+#include <vector>
 
 namespace base {
 
 // Detect encoding of |text| and put the name of encoding (as returned by ICU)
 // in |encoding|. For ASCII texts |encoding| will be set to an empty string.
 // Returns true on success.
 bool DetectEncoding(const std::string& text, std::string* encoding);
 
+// Detect all possible encodings of |text| and put their names
+// (as returned by ICU) in |encodings|. Returns true on success.
+bool DetectAllEncodings(const std::string& text,

[eroman, 2010/11/16 00:35:03]

It doesn't look like the return value is used anywhere. Perhaps callers should
just expect that |encodings| may be empty and assume that is the "error" case.

[Paweł Hajdan Jr., 2010/11/16 21:22:39]

That was actually my mistake. Added a check of the return value.

+                        std::vector<std::string>* encodings);
+
 }  // namespace base
 
 #endif  // BASE_I18N_ICU_ENCODING_DETECTION_H_