Verify FormatType in ScopedClipboardWriter::WritePickledData.

ui/base/clipboard/clipboard_mac.mm

Index: ui/base/clipboard/clipboard_mac.mm
diff --git a/ui/base/clipboard/clipboard_mac.mm b/ui/base/clipboard/clipboard_mac.mm
index 0d0b2fa823408a4122c38f994229555b459d9b5b..9394dc74cd24c7abcaf8c18c68d742d534470cb3 100644
--- a/ui/base/clipboard/clipboard_mac.mm
+++ b/ui/base/clipboard/clipboard_mac.mm
@@ -84,6 +84,10 @@ Clipboard::FormatType Clipboard::FormatType::Deserialize(
   return FormatType(base::SysUTF8ToNSString(serialization));
 }
 
+bool Clipboard::FormatType::operator<(const FormatType& other) const {
+  return [data_ compare:other.data_] == NSOrderedAscending;
+}
+
 Clipboard::Clipboard() {
   DCHECK(CalledOnValidThread());
 }
@@ -363,7 +367,7 @@ void Clipboard::ReadData(const FormatType& format, std::string* result) const {
 }
 
 // static
-Clipboard::FormatType Clipboard::GetFormatType(
+Clipboard::FormatType Clipboard::GetFormatTypeInternal(
     const std::string& format_string) {
   return FormatType::Deserialize(format_string);
 }
@@ -427,13 +431,17 @@ const Clipboard::FormatType& Clipboard::GetWebKitSmartPasteFormatType() {
 
 // static
 const Clipboard::FormatType& Clipboard::GetWebCustomDataFormatType() {
-  CR_DEFINE_STATIC_LOCAL(FormatType, type, (kWebCustomDataPboardType));
+  CR_DEFINE_STATIC_LOCAL(
+      FormatType, type, (GetFormatType([kWebCustomDataPboardType UTF8String])));
   return type;
 }
 
 // static
 const Clipboard::FormatType& Clipboard::GetPepperCustomDataFormatType() {
-  CR_DEFINE_STATIC_LOCAL(FormatType, type, (kPepperCustomDataPboardType));
+  CR_DEFINE_STATIC_LOCAL(
+      FormatType,
+      type,
+      (GetFormatType([kPepperCustomDataPboardType UTF8String])));
   return type;
 }