Verify FormatType in ScopedClipboardWriter::WritePickledData.

ui/base/clipboard/clipboard_gtk.cc

Index: ui/base/clipboard/clipboard_gtk.cc
diff --git a/ui/base/clipboard/clipboard_gtk.cc b/ui/base/clipboard/clipboard_gtk.cc
index 8f819113ac408eacad5f1104d72dc935053e4821..fddd86b8ab17221bf724b7086f1354c478a95059 100644
--- a/ui/base/clipboard/clipboard_gtk.cc
+++ b/ui/base/clipboard/clipboard_gtk.cc
@@ -202,6 +202,10 @@ Clipboard::FormatType Clipboard::FormatType::Deserialize(
   return FormatType(serialization);
 }
 
+bool Clipboard::FormatType::operator<(const FormatType& other) const {
+  return GdkAtomToString(data_) < GdkAtomToString(other.data_);
+}
+
 bool Clipboard::FormatType::Equals(const FormatType& other) const {
   return data_ == other.data_;
 }
@@ -592,7 +596,7 @@ uint64 Clipboard::GetSequenceNumber(ClipboardType type) {
 }
 
 //static
-Clipboard::FormatType Clipboard::GetFormatType(
+Clipboard::FormatType Clipboard::GetFormatTypeInternal(
     const std::string& format_string) {
   return FormatType::Deserialize(format_string);
 }
@@ -645,13 +649,15 @@ const Clipboard::FormatType& Clipboard::GetWebKitSmartPasteFormatType() {
 
 // static
 const Clipboard::FormatType& Clipboard::GetWebCustomDataFormatType() {
-  CR_DEFINE_STATIC_LOCAL(FormatType, type, (kMimeTypeWebCustomData));
+  CR_DEFINE_STATIC_LOCAL(
+      FormatType, type, (GetFormatType(kMimeTypeWebCustomData)));
   return type;
 }
 
 // static
 const Clipboard::FormatType& Clipboard::GetPepperCustomDataFormatType() {
-  CR_DEFINE_STATIC_LOCAL(FormatType, type, (kMimeTypePepperCustomData));
+  CR_DEFINE_STATIC_LOCAL(
+      FormatType, type, (GetFormatType(kMimeTypePepperCustomData)));
   return type;
 }