Make Clipboard::FormatType an opaque handle type.

chrome/browser/bookmarks/bookmark_node_data.cc

Index: chrome/browser/bookmarks/bookmark_node_data.cc
diff --git a/chrome/browser/bookmarks/bookmark_node_data.cc b/chrome/browser/bookmarks/bookmark_node_data.cc
index eb12b98cfcc9e72e15c16a6b97e619aecbcdcdd9..6ddf3bdd48622f88db0d9a64a36ff1cdfca945c3 100644
--- a/chrome/browser/bookmarks/bookmark_node_data.cc
+++ b/chrome/browser/bookmarks/bookmark_node_data.cc
@@ -161,13 +161,15 @@ void BookmarkNodeData::WriteToClipboard(Profile* profile) const {
 
   Pickle pickle;
   WriteToPickle(profile, &pickle);
-  scw.WritePickledData(pickle, kClipboardFormatString);
+  scw.WritePickledData(
+      pickle, ui::Clipboard::GetFormatType(kClipboardFormatString));
 }
 
 bool BookmarkNodeData::ReadFromClipboard() {
   std::string data;
   ui::Clipboard* clipboard = g_browser_process->clipboard();
-  clipboard->ReadData(kClipboardFormatString, &data);
+  clipboard->ReadData(ui::Clipboard::GetFormatType(kClipboardFormatString),
+                      &data);
 
   if (!data.empty()) {
     Pickle pickle(data.data(), data.size());
@@ -193,8 +195,9 @@ bool BookmarkNodeData::ReadFromClipboard() {
 }
 
 bool BookmarkNodeData::ClipboardContainsBookmarks() {
-  return g_browser_process->clipboard()->IsFormatAvailableByString(
-      BookmarkNodeData::kClipboardFormatString, ui::Clipboard::BUFFER_STANDARD);
+  return g_browser_process->clipboard()->IsFormatAvailable(
+      ui::Clipboard::GetFormatType(kClipboardFormatString),
+      ui::Clipboard::BUFFER_STANDARD);
 }
 #else
 void BookmarkNodeData::WriteToClipboard(Profile* profile) const {