Revert 256981 "Verify FormatType in ScopedClipboardWriter::Write..."

> Verify FormatType in ScopedClipboardWriter::WritePickledData.
> 
> BUG=352395
> R=tony@chromium.org
> TBR=sky@chromium.org
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=256974
> 
> Review URL: https://codereview.chromium.org/199763002

TBR=dcheng@chromium.org

Review URL: https://codereview.chromium.org/196943018

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257336 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 11 deletions

diff --git a/ui/base/clipboard/clipboard_mac.mm b/ui/base/clipboard/clipboard_mac.mm
index 7da3d2b..0b6d3a7 100644
--- a/ui/base/clipboard/clipboard_mac.mm
+++ b/ui/base/clipboard/clipboard_mac.mm
@@ -88,10 +88,6 @@ 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());
 }
@@ -371,7 +367,7 @@ void Clipboard::ReadData(const FormatType& format, std::string* result) const {
 }
 
 // static
-Clipboard::FormatType Clipboard::GetFormatTypeInternal(
+Clipboard::FormatType Clipboard::GetFormatType(
     const std::string& format_string) {
   return FormatType::Deserialize(format_string);
 }
@@ -435,17 +431,13 @@ const Clipboard::FormatType& Clipboard::GetWebKitSmartPasteFormatType() {
 
 // static
 const Clipboard::FormatType& Clipboard::GetWebCustomDataFormatType() {
-  CR_DEFINE_STATIC_LOCAL(
-      FormatType, type, (GetFormatType([kWebCustomDataPboardType UTF8String])));
+  CR_DEFINE_STATIC_LOCAL(FormatType, type, (kWebCustomDataPboardType));
   return type;
 }
 
 // static
 const Clipboard::FormatType& Clipboard::GetPepperCustomDataFormatType() {
-  CR_DEFINE_STATIC_LOCAL(
-      FormatType,
-      type,
-      (GetFormatType([kPepperCustomDataPboardType UTF8String])));
+  CR_DEFINE_STATIC_LOCAL(FormatType, type, (kPepperCustomDataPboardType));
   return type;
 }