Verify FormatType in ScopedClipboardWriter::WritePickledData.

ui/base/clipboard/clipboard_android.cc

Index: ui/base/clipboard/clipboard_android.cc
diff --git a/ui/base/clipboard/clipboard_android.cc b/ui/base/clipboard/clipboard_android.cc
index e5e2a960d4da4c4558f8e4c115ca8d4ab3bf285e..f8feadc57c83ad012963accf5fed962c58e7bd2e 100644
--- a/ui/base/clipboard/clipboard_android.cc
+++ b/ui/base/clipboard/clipboard_android.cc
@@ -198,6 +198,10 @@ Clipboard::FormatType Clipboard::FormatType::Deserialize(
   return FormatType(serialization);
 }
 
+bool Clipboard::FormatType::operator<(const FormatType& other) const {
+  return data_ < other.data_;
+}
+
 bool Clipboard::FormatType::Equals(const FormatType& other) const {
   return data_ == other.data_;
 }
@@ -335,7 +339,7 @@ void Clipboard::ReadData(const Clipboard::FormatType& format,
 }
 
 // static
-Clipboard::FormatType Clipboard::GetFormatType(
+Clipboard::FormatType Clipboard::GetFormatTypeInternal(
     const std::string& format_string) {
   return FormatType::Deserialize(format_string);
 }
@@ -378,13 +382,15 @@ const Clipboard::FormatType& Clipboard::GetBitmapFormatType() {
 
 // 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;
 }