Verify FormatType in ScopedClipboardWriter::WritePickledData.

ui/base/clipboard/clipboard_gtk.cc

 // 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"
 
 #include <gtk/gtk.h>
 #include <X11/extensions/Xfixes.h>
 #include <X11/Xatom.h>
 #include <map>
@@ skipping 184 matching lines @@
 std::string Clipboard::FormatType::Serialize() const {
   return GdkAtomToString(data_);
 }
 
 // static
 Clipboard::FormatType Clipboard::FormatType::Deserialize(
     const std::string& serialization) {
   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_;
 }
 
 Clipboard::Clipboard() : clipboard_data_(NULL) {
   DCHECK(CalledOnValidThread());
   clipboard_ = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
   primary_selection_ = gtk_clipboard_get(GDK_SELECTION_PRIMARY);
 }
 
@@ skipping 370 matching lines @@
 
 uint64 Clipboard::GetSequenceNumber(ClipboardType type) {
   DCHECK(CalledOnValidThread());
   if (type == CLIPBOARD_TYPE_COPY_PASTE)
     return SelectionChangeObserver::GetInstance()->clipboard_sequence_number();
   else
     return SelectionChangeObserver::GetInstance()->primary_sequence_number();
 }
 
 //static
-Clipboard::FormatType Clipboard::GetFormatType(
+Clipboard::FormatType Clipboard::GetFormatTypeInternal(
     const std::string& format_string) {
   return FormatType::Deserialize(format_string);
 }
 
 // static
 const Clipboard::FormatType& Clipboard::GetPlainTextFormatType() {
   CR_DEFINE_STATIC_LOCAL(
       FormatType, type, (GDK_TARGET_STRING));
   return type;
 }
@@ skipping 32 matching lines @@
 }
 
 // static
 const Clipboard::FormatType& Clipboard::GetWebKitSmartPasteFormatType() {
   CR_DEFINE_STATIC_LOCAL(FormatType, type, (kMimeTypeWebkitSmartPaste));
   return type;
 }
 
 // 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;
 }
 
 void Clipboard::InsertMapping(const char* key,
                               char* data,
                               size_t data_len) {
   DCHECK(clipboard_data_->find(key) == clipboard_data_->end());
   (*clipboard_data_)[key] = std::make_pair(data, data_len);
 }
 
 GtkClipboard* Clipboard::LookupBackingClipboard(ClipboardType type) const {
   switch (type) {
     case CLIPBOARD_TYPE_COPY_PASTE:
       return clipboard_;
     case CLIPBOARD_TYPE_SELECTION:
       return primary_selection_;
     default:
       NOTREACHED();
       return NULL;
   }
 }
 
 }  // namespace ui