Refactor more clipboard/bookmark logic.

ui/base/clipboard/clipboard_mac.mm

 // Copyright (c) 2012 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.
 
 #include "ui/base/clipboard/clipboard_mac.h"
 
 #import <Cocoa/Cocoa.h>
 #include <stdint.h>
 
 #include <limits>
@@ skipping 408 matching lines @@
                                  const char* url_data,
                                  size_t url_len) {
   std::string title_str(title_data, title_len);
   NSString* title = base::SysUTF8ToNSString(title_str);
   std::string url_str(url_data, url_len);
   NSString* url = base::SysUTF8ToNSString(url_str);
 
   base::scoped_nsobject<NSPasteboardItem> item(
       ClipboardUtil::PasteboardItemFromUrl(url, title));
   NSPasteboard* pb = GetPasteboard();
-
-  NSSet* oldTypes = [NSSet setWithArray:[pb types]];
-  NSMutableSet* newTypes = [NSMutableSet setWithArray:[item types]];
-  [newTypes minusSet:oldTypes];
-
-  [pb addTypes:[newTypes allObjects] owner:nil];
-  for (NSString* type in newTypes) {
-    // Technically, the object associated with |type| might be an NSString or a
-    // property list. It doesn't matter though, since the type gets pulled from
-    // and shoved into an NSDictionary.
-    [pb setData:[item dataForType:type] forType:type];
-  }
+  ui::ClipboardUtil::AddDataToPasteboard(pb, item);
 }
 
 void ClipboardMac::WriteBitmap(const SkBitmap& bitmap) {
   NSImage* image = skia::SkBitmapToNSImageWithColorSpace(
       bitmap, base::mac::GetSystemColorSpace());
   // An API to ask the NSImage to write itself to the clipboard comes in 10.6 :(
   // For now, spit out the image as a TIFF.
   NSPasteboard* pb = GetPasteboard();
   [pb addTypes:[NSArray arrayWithObject:NSTIFFPboardType] owner:nil];
   NSData* tiff_data = [image TIFFRepresentation];
@@ skipping 15 matching lines @@
 // Write an extra flavor that signifies WebKit was the last to modify the
 // pasteboard. This flavor has no data.
 void ClipboardMac::WriteWebSmartPaste() {
   NSPasteboard* pb = GetPasteboard();
   NSString* format = GetWebKitSmartPasteFormatType().ToNSString();
   [pb addTypes:[NSArray arrayWithObject:format] owner:nil];
   [pb setData:nil forType:format];
 }
 
 }  // namespace ui