Verify FormatType in ScopedClipboardWriter::WritePickledData.

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 cb254af461880ea6e46be54d0ed2da9e11165e2b..a6078193277bc84f31b734d790079beae09539dc 100644
--- a/chrome/browser/bookmarks/bookmark_node_data.cc
+++ b/chrome/browser/bookmarks/bookmark_node_data.cc
@@ -15,9 +15,6 @@
 #include "chrome/browser/profiles/profile.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 
-const char* BookmarkNodeData::kClipboardFormatString =
-    "chromium/x-bookmark-entries";
-
 BookmarkNodeData::Element::Element() : is_url(false), id_(0) {
 }
 
@@ -99,6 +96,15 @@ bool BookmarkNodeData::Element::ReadFromPickle(Pickle* pickle,
 
 // BookmarkNodeData -----------------------------------------------------------
 
+// static
+const ui::Clipboard::FormatType& BookmarkNodeData::GetFormatType() {
+  CR_DEFINE_STATIC_LOCAL(
+      ui::Clipboard::FormatType,
+      type,
+      (ui::Clipboard::GetFormatType("chromium/x-bookmark-entries")));
+  return type;
+}
+
 BookmarkNodeData::BookmarkNodeData() {
 }
 
@@ -118,7 +124,7 @@ BookmarkNodeData::~BookmarkNodeData() {
 // static
 bool BookmarkNodeData::ClipboardContainsBookmarks() {
   return ui::Clipboard::GetForCurrentThread()->IsFormatAvailable(
-      ui::Clipboard::GetFormatType(kClipboardFormatString),
+      GetFormatType(),
       ui::CLIPBOARD_TYPE_COPY_PASTE);
 }
 #endif
@@ -180,16 +186,14 @@ void BookmarkNodeData::WriteToClipboard(ui::ClipboardType type) {
 
   Pickle pickle;
   WriteToPickle(NULL, &pickle);
-  scw.WritePickledData(pickle,
-                       ui::Clipboard::GetFormatType(kClipboardFormatString));
+  scw.WritePickledData(pickle, GetFormatType());
 }
 
 bool BookmarkNodeData::ReadFromClipboard(ui::ClipboardType type) {
   DCHECK_EQ(type, ui::CLIPBOARD_TYPE_COPY_PASTE);
   std::string data;
   ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
-  clipboard->ReadData(ui::Clipboard::GetFormatType(kClipboardFormatString),
-                      &data);
+  clipboard->ReadData(GetFormatType(), &data);
 
   if (!data.empty()) {
     Pickle pickle(data.data(), data.size());