Merge "Pass more hints to encoding detector." to M57 branch

third_party/WebKit/Source/platform/text/TextEncodingDetector.cpp

Index: third_party/WebKit/Source/platform/text/TextEncodingDetector.cpp
diff --git a/third_party/WebKit/Source/platform/text/TextEncodingDetector.cpp b/third_party/WebKit/Source/platform/text/TextEncodingDetector.cpp
index c12153f08f830617763e21efd8c32801cc914525..a9497c74be0ff92a8233ad4cda8bcdd7f5939b5a 100644
--- a/third_party/WebKit/Source/platform/text/TextEncodingDetector.cpp
+++ b/third_party/WebKit/Source/platform/text/TextEncodingDetector.cpp
@@ -38,13 +38,17 @@ namespace blink {
 bool detectTextEncoding(const char* data,
                         size_t length,
                         const char* hintEncodingName,
+                        const char* hintUrl,
+                        const char* hintUserLanguage,
                         WTF::TextEncoding* detectedEncoding) {
   *detectedEncoding = WTF::TextEncoding();
+  Language language;
+  LanguageFromCode(hintUserLanguage, &language);
   int consumedBytes;
   bool isReliable;
   Encoding encoding = CompactEncDet::DetectEncoding(
-      data, length, nullptr, nullptr, nullptr,
-      EncodingNameAliasToEncoding(hintEncodingName), UNKNOWN_LANGUAGE,
+      data, length, hintUrl, nullptr, nullptr,
+      EncodingNameAliasToEncoding(hintEncodingName), language,
       CompactEncDet::WEB_CORPUS,
       false,  // Include 7-bit encodings to detect ISO-2022-JP
       &consumedBytes, &isReliable);