Revert of Create net::FormatOriginForDisplay helper function.

base/strings/utf_string_conversions.h

Index: base/strings/utf_string_conversions.h
diff --git a/base/strings/utf_string_conversions.h b/base/strings/utf_string_conversions.h
index 0d2e233715d2dcf4deadbe63d8b03443bf36aab5..06a3bc64767791909dd6a3d0b454bda972812f73 100644
--- a/base/strings/utf_string_conversions.h
+++ b/base/strings/utf_string_conversions.h
@@ -15,10 +15,10 @@
 
 // These convert between UTF-8, -16, and -32 strings. They are potentially slow,
 // so avoid unnecessary conversions. The low-level versions return a boolean
-// indicating whether the conversion was 100% valid. In case the conversion is
-// not 100% valid, these functions will still do the best they can and put the
-// result in the output buffer. The versions that return strings ignore this
-// error and just return the best conversion possible.
+// indicating whether the conversion was 100% valid. In this case, it will still
+// do the best it can and put the result in the output buffer. The versions that
+// return strings ignore this error and just return the best conversion
+// possible.
 BASE_EXPORT bool WideToUTF8(const wchar_t* src, size_t src_len,
                             std::string* output);
 BASE_EXPORT std::string WideToUTF8(const std::wstring& wide);
@@ -39,7 +39,7 @@
                              std::string* output);
 BASE_EXPORT std::string UTF16ToUTF8(const string16& utf16);
 
-// This converts an ASCII string, typically a hardcoded constant, to a UTF-16
+// This converts an ASCII string, typically a hardcoded constant, to a UTF16
 // string.
 BASE_EXPORT string16 ASCIIToUTF16(const StringPiece& ascii);