This changes the base clipboard class.

base/clipboard_win.cc

 // Copyright (c) 2006-2008 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.
 
 // Many of these functions are based on those found in
 // webkit/port/platform/PasteboardWin.cpp
 
 #include "base/clipboard.h"
 
 #include <shlobj.h>
@@ skipping 172 matching lines @@
                           size_t url_len) {
   std::string markup(markup_data, markup_len);
   std::string url;
 
   if (url_len > 0)
     url.assign(url_data, url_len);
 
   std::string html_fragment = ClipboardUtil::HtmlToCFHtml(markup, url);
   HGLOBAL glob = CreateGlobalData(html_fragment);
 
-  WriteToClipboard(GetHtmlFormatType(), glob);
+  WriteToClipboard(StringToInt(GetHtmlFormatType()), glob);
 }
 
 void Clipboard::WriteBookmark(const char* title_data,
                               size_t title_len,
                               const char* url_data,
                               size_t url_len) {
   std::string bookmark(title_data, title_len);
   bookmark.append(1, L'\n');
   bookmark.append(url_data, url_len);
 
   string16 wide_bookmark = UTF8ToWide(bookmark);
   HGLOBAL glob = CreateGlobalData(wide_bookmark);
 
-  WriteToClipboard(GetUrlWFormatType(), glob);
+  WriteToClipboard(StringToInt(GetUrlWFormatType()), glob);
 }
 
 void Clipboard::WriteHyperlink(const char* title_data,
                                size_t title_len,
                                const char* url_data,
                                size_t url_len) {
   // Store as a bookmark.
   WriteBookmark(title_data, title_len, url_data, url_len);
 
   std::string title(title_data, title_len),
       url(url_data, url_len),
       link("<a href=\"");
 
   // Construct the hyperlink.
   link.append(url);
   link.append("\">");
   link.append(title);
   link.append("</a>");
 
   // Store hyperlink as html.
   WriteHTML(link.c_str(), link.size(), NULL, 0);
 }
 
 void Clipboard::WriteWebSmartPaste() {
   DCHECK(clipboard_owner_);
-  ::SetClipboardData(GetWebKitSmartPasteFormatType(), NULL);
+  ::SetClipboardData(StringToInt(GetWebKitSmartPasteFormatType()), NULL);
 }
 
 void Clipboard::WriteBitmap(const char* pixel_data, const char* size_data) {
   const gfx::Size* size = reinterpret_cast<const gfx::Size*>(size_data);
   HDC dc = ::GetDC(NULL);
 
   // This doesn't actually cost us a memcpy when the bitmap comes from the
   // renderer as we load it into the bitmap using setPixels which just sets a
   // pointer.  Someone has to memcpy it into GDI, it might as well be us here.
 
@@ skipping 120 matching lines @@
   DROPFILES* drop_files = reinterpret_cast<DROPFILES*>(data);
   drop_files->pFiles = sizeof(DROPFILES);
   drop_files->fWide = TRUE;
 
   memcpy(data + sizeof(DROPFILES), file_data, file_len);
 
   ::GlobalUnlock(hdata);
   WriteToClipboard(CF_HDROP, hdata);
 }
 
-void Clipboard::WriteToClipboard(FormatType format, HANDLE handle) {
+void Clipboard::WriteToClipboard(unsigned int format, HANDLE handle) {
   DCHECK(clipboard_owner_);
   if (handle && !::SetClipboardData(format, handle)) {
     DCHECK(ERROR_CLIPBOARD_NOT_OPEN != GetLastError());
     FreeData(format, handle);
   }
 }
 
-bool Clipboard::IsFormatAvailable(unsigned int format) const {
-  return ::IsClipboardFormatAvailable(format) != FALSE;
+bool Clipboard::IsFormatAvailable(const Clipboard::FormatType& format) const {
+  return ::IsClipboardFormatAvailable(StringToInt(format)) != FALSE;
 }
 
 void Clipboard::ReadText(string16* result) const {
   if (!result) {
     NOTREACHED();
     return;
   }
 
   result->clear();
 
@@ skipping 36 matching lines @@
     markup->clear();
 
   if (src_url)
     src_url->clear();
 
   // Acquire the clipboard.
   ScopedClipboard clipboard;
   if (!clipboard.Acquire(GetClipboardWindow()))
     return;
 
-  HANDLE data = ::GetClipboardData(GetHtmlFormatType());
+  HANDLE data = ::GetClipboardData(StringToInt(GetHtmlFormatType()));
   if (!data)
     return;
 
   std::string html_fragment(static_cast<const char*>(::GlobalLock(data)));
   ::GlobalUnlock(data);
 
   std::string markup_utf8;
   ClipboardUtil::CFHtmlToHtml(html_fragment, &markup_utf8, src_url);
   markup->assign(UTF8ToWide(markup_utf8));
 }
 
 void Clipboard::ReadBookmark(string16* title, std::string* url) const {
   if (title)
     title->clear();
 
   if (url)
     url->clear();
 
   // Acquire the clipboard.
   ScopedClipboard clipboard;
   if (!clipboard.Acquire(GetClipboardWindow()))
     return;
 
-  HANDLE data = ::GetClipboardData(GetUrlWFormatType());
+  HANDLE data = ::GetClipboardData(StringToInt(GetUrlWFormatType()));
   if (!data)
     return;
 
   string16 bookmark(static_cast<const char16*>(::GlobalLock(data)));
   ::GlobalUnlock(data);
 
   ParseBookmarkClipboardFormat(bookmark, title, url);
 }
 
 // Read a file in HDROP format from the clipboard.
@@ skipping 54 matching lines @@
 
   if (url) {
     const size_t url_start = bookmark.find_first_not_of(kDelim, title_end);
     if (url_start != string16::npos)
       *url = UTF16ToUTF8(bookmark.substr(url_start, string16::npos));
   }
 }
 
 // static
 Clipboard::FormatType Clipboard::GetUrlFormatType() {
-  return ClipboardUtil::GetUrlFormat()->cfFormat;
+  return IntToString(ClipboardUtil::GetUrlFormat()->cfFormat);
 }
 
 // static
 Clipboard::FormatType Clipboard::GetUrlWFormatType() {
-  return ClipboardUtil::GetUrlWFormat()->cfFormat;
+  return IntToString(ClipboardUtil::GetUrlWFormat()->cfFormat);
 }
 
 // static
 Clipboard::FormatType Clipboard::GetMozUrlFormatType() {
-  return ClipboardUtil::GetMozUrlFormat()->cfFormat;
+  return IntToString(ClipboardUtil::GetMozUrlFormat()->cfFormat);
 }
 
 // static
 Clipboard::FormatType Clipboard::GetPlainTextFormatType() {
-  return ClipboardUtil::GetPlainTextFormat()->cfFormat;
+  return IntToString(ClipboardUtil::GetPlainTextFormat()->cfFormat);
 }
 
 // static
 Clipboard::FormatType Clipboard::GetPlainTextWFormatType() {
-  return ClipboardUtil::GetPlainTextWFormat()->cfFormat;
+  return IntToString(ClipboardUtil::GetPlainTextWFormat()->cfFormat);
 }
 
 // static
 Clipboard::FormatType Clipboard::GetFilenameFormatType() {
-  return ClipboardUtil::GetFilenameFormat()->cfFormat;
+  return IntToString(ClipboardUtil::GetFilenameFormat()->cfFormat);
 }
 
 // static
 Clipboard::FormatType Clipboard::GetFilenameWFormatType() {
-  return ClipboardUtil::GetFilenameWFormat()->cfFormat;
+  return IntToString(ClipboardUtil::GetFilenameWFormat()->cfFormat);
 }
 
 // MS HTML Format
 // static
 Clipboard::FormatType Clipboard::GetHtmlFormatType() {
-  return ClipboardUtil::GetHtmlFormat()->cfFormat;
+  return IntToString(ClipboardUtil::GetHtmlFormat()->cfFormat);
 }
 
 // static
 Clipboard::FormatType Clipboard::GetBitmapFormatType() {
-  return CF_BITMAP;
+  return IntToString(CF_BITMAP);
 }
 
 // Firefox text/html
 // static
 Clipboard::FormatType Clipboard::GetTextHtmlFormatType() {
-  return ClipboardUtil::GetTextHtmlFormat()->cfFormat;
+  return IntToString(ClipboardUtil::GetTextHtmlFormat()->cfFormat);
 }
 
 // static
 Clipboard::FormatType Clipboard::GetCFHDropFormatType() {
-  return ClipboardUtil::GetCFHDropFormat()->cfFormat;
+  return IntToString(ClipboardUtil::GetCFHDropFormat()->cfFormat);
 }
 
 // static
 Clipboard::FormatType Clipboard::GetFileDescriptorFormatType() {
-  return ClipboardUtil::GetFileDescriptorFormat()->cfFormat;
+  return IntToString(ClipboardUtil::GetFileDescriptorFormat()->cfFormat);
 }
 
 // static
 Clipboard::FormatType Clipboard::GetFileContentFormatZeroType() {
-  return ClipboardUtil::GetFileContentFormatZero()->cfFormat;
+  return IntToString(ClipboardUtil::GetFileContentFormatZero()->cfFormat);
 }
 
 // static
 void Clipboard::DuplicateRemoteHandles(base::ProcessHandle process,
                                        ObjectMap* objects) {
   for (ObjectMap::iterator iter = objects->begin(); iter != objects->end();
        ++iter) {
     if (iter->first == CBF_SMBITMAP) {
       // There is a shared memory handle encoded on the first ObjectMapParam.
       // Use it to open a local handle to the memory.
       char* bitmap_data = &(iter->second[0].front());
       base::SharedMemoryHandle* remote_bitmap_handle =
           reinterpret_cast<base::SharedMemoryHandle*>(bitmap_data);
 
       base::SharedMemory* bitmap = new base::SharedMemory(*remote_bitmap_handle,
                                                           false, process);
 
       // We store the object where the remote handle was located so it can
       // be retrieved by the UI thread (see WriteBitmapFromSharedMemory()).
       iter->second[0].clear();
       for (size_t i = 0; i < sizeof(bitmap); i++)
         iter->second[0].push_back(reinterpret_cast<char*>(&bitmap)[i]);
     }
   }
 }
 
 // static
 Clipboard::FormatType Clipboard::GetWebKitSmartPasteFormatType() {
-  return ClipboardUtil::GetWebKitSmartPasteFormat()->cfFormat;
+  return IntToString(ClipboardUtil::GetWebKitSmartPasteFormat()->cfFormat);
 }
 
 // static
-void Clipboard::FreeData(FormatType format, HANDLE data) {
+void Clipboard::FreeData(unsigned int format, HANDLE data) {
   if (format == CF_BITMAP)
     ::DeleteObject(static_cast<HBITMAP>(data));
   else
     ::GlobalFree(data);
 }
 
 HWND Clipboard::GetClipboardWindow() const {
   if (!clipboard_owner_ && create_window_) {
     clipboard_owner_ = ::CreateWindow(L"ClipboardOwnerWindowClass",
                                       L"ClipboardOwnerWindow",
                                       0, 0, 0, 0, 0,
                                       HWND_MESSAGE,
                                       0, 0, 0);
   }
   return clipboard_owner_;
 }