Verify FormatType in ScopedClipboardWriter::WritePickledData.

ui/base/clipboard/clipboard_mac.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/base/clipboard/clipboard.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
@@ skipping 66 matching lines @@
 std::string Clipboard::FormatType::Serialize() const {
   return base::SysNSStringToUTF8(data_);
 }
 
 // static
 Clipboard::FormatType Clipboard::FormatType::Deserialize(
     const std::string& serialization) {
   return FormatType(base::SysUTF8ToNSString(serialization));
 }
 
+bool Clipboard::FormatType::operator<(const FormatType& other) const {
+  return [data_ compare:other.data_] == NSOrderedAscending;
+}
+
 Clipboard::Clipboard() {
   DCHECK(CalledOnValidThread());
 }
 
 Clipboard::~Clipboard() {
   DCHECK(CalledOnValidThread());
 }
 
 void Clipboard::WriteObjects(ClipboardType type, const ObjectMap& objects) {
   DCHECK(CalledOnValidThread());
@@ skipping 259 matching lines @@
 
 void Clipboard::ReadData(const FormatType& format, std::string* result) const {
   DCHECK(CalledOnValidThread());
   NSPasteboard* pb = GetPasteboard();
   NSData* data = [pb dataForType:format.ToNSString()];
   if ([data length])
     result->assign(static_cast<const char*>([data bytes]), [data length]);
 }
 
 // static
-Clipboard::FormatType Clipboard::GetFormatType(
+Clipboard::FormatType Clipboard::GetFormatTypeInternal(
     const std::string& format_string) {
   return FormatType::Deserialize(format_string);
 }
 
 // static
 const Clipboard::FormatType& Clipboard::GetUrlFormatType() {
   CR_DEFINE_STATIC_LOCAL(FormatType, type, (NSURLPboardType));
   return type;
 }
 
@@ skipping 43 matching lines @@
 }
 
 // static
 const Clipboard::FormatType& Clipboard::GetWebKitSmartPasteFormatType() {
   CR_DEFINE_STATIC_LOCAL(FormatType, type, (kWebSmartPastePboardType));
   return type;
 }
 
 // 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;
 }
 
 }  // namespace ui