Verify FormatType in ScopedClipboardWriter::WritePickledData.

chrome/browser/bookmarks/bookmark_node_data_views.cc

Index: chrome/browser/bookmarks/bookmark_node_data_views.cc
diff --git a/chrome/browser/bookmarks/bookmark_node_data_views.cc b/chrome/browser/bookmarks/bookmark_node_data_views.cc
index 87b8cb4936fd8ab19a707ce1cdfd1cae6615dc4f..19a63ee704eb21549cc1c8b3eb0cddd3fc27105e 100644
--- a/chrome/browser/bookmarks/bookmark_node_data_views.cc
+++ b/chrome/browser/bookmarks/bookmark_node_data_views.cc
@@ -10,17 +10,6 @@
 #include "content/public/common/url_constants.h"
 #include "ui/base/clipboard/clipboard.h"
 
-// static
-const ui::OSExchangeData::CustomFormat&
-BookmarkNodeData::GetBookmarkCustomFormat() {
-  CR_DEFINE_STATIC_LOCAL(
-      ui::OSExchangeData::CustomFormat,
-      format,
-      (ui::Clipboard::GetFormatType(BookmarkNodeData::kClipboardFormatString)));
-
-  return format;
-}
-
 void BookmarkNodeData::Write(Profile* profile, ui::OSExchangeData* data) const {
   DCHECK(data);
 
@@ -37,7 +26,7 @@ void BookmarkNodeData::Write(Profile* profile, ui::OSExchangeData* data) const {
   Pickle data_pickle;
   WriteToPickle(profile, &data_pickle);
 
-  data->SetPickledData(GetBookmarkCustomFormat(), data_pickle);
+  data->SetPickledData(GetFormatType(), data_pickle);
 }
 
 bool BookmarkNodeData::Read(const ui::OSExchangeData& data) {
@@ -45,9 +34,9 @@ bool BookmarkNodeData::Read(const ui::OSExchangeData& data) {
 
   profile_path_.clear();
 
-  if (data.HasCustomFormat(GetBookmarkCustomFormat())) {
+  if (data.HasCustomFormat(GetFormatType())) {
     Pickle drag_data_pickle;
-    if (data.GetPickledData(GetBookmarkCustomFormat(), &drag_data_pickle)) {
+    if (data.GetPickledData(GetFormatType(), &drag_data_pickle)) {
       if (!ReadFromPickle(&drag_data_pickle))
         return false;
     }