Allow WebString.utf8() to take UTF8ConversionMode

third_party/WebKit/Source/wtf/text/StringUTF8Adaptor.h

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 28 matching lines @@
 
 namespace WTF {
 
 // This class lets you get UTF-8 data out of a String without mallocing a
 // separate buffer to hold the data if the String happens to be 8 bit and
 // contain only ASCII characters.
 class StringUTF8Adaptor final {
   DISALLOW_NEW();
 
  public:
-  explicit StringUTF8Adaptor(const String& string) : m_data(0), m_length(0) {
+  StringUTF8Adaptor(const String& string,
+                    UTF8ConversionMode mode = LenientUTF8Conversion)
+      : m_data(0), m_length(0) {
     if (string.isEmpty())
       return;
     // Unfortunately, 8 bit WTFStrings are encoded in Latin-1 and GURL uses
     // UTF-8 when processing 8 bit strings. If |relative| is entirely ASCII, we
     // luck out and can avoid mallocing a new buffer to hold the UTF-8 data
     // because UTF-8 and Latin-1 use the same code units for ASCII code points.
     if (string.is8Bit() && string.containsOnlyASCII()) {
       m_data = reinterpret_cast<const char*>(string.characters8());
       m_length = string.length();
     } else {
-      m_utf8Buffer = string.utf8();
+      m_utf8Buffer = string.utf8(mode);
       m_data = m_utf8Buffer.data();
       m_length = m_utf8Buffer.length();
     }
   }
 
   const char* data() const { return m_data; }
   size_t length() const { return m_length; }
 
   base::StringPiece asStringPiece() const {
     return base::StringPiece(m_data, m_length);
   }
 
  private:
   CString m_utf8Buffer;
   const char* m_data;
   size_t m_length;
 };
 
 }  // namespace WTF
 
 using WTF::StringUTF8Adaptor;
 
 #endif  // StringUTF8Adaptor_h