[Merge to 2743] [Mac] Fix regression with copying URLs from the Omnibox.

ui/base/clipboard/clipboard_util_mac.mm

 // Copyright 2016 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_util_mac.h"
 
 #include "base/mac/foundation_util.h"
 #include "base/mac/scoped_cftyperef.h"
 
 namespace {
 NSString* const kWebURLsWithTitlesPboardType = @"WebURLsWithTitlesPboardType";
-NSString* const kCorePasteboardFlavorType_url =
-    @"CorePasteboardFlavorType 0x75726C20";  // 'url '  url
-NSString* const kCorePasteboardFlavorType_urln =
-    @"CorePasteboardFlavorType 0x75726C6E";  // 'urln'  title
+NSString* const kPublicUrl = @"public.url";
+NSString* const kPublicUrlName = @"public.url-name";
 
 // It's much more convenient to return an NSString than a
 // base::ScopedCFTypeRef<CFStringRef>, since the methods on NSPasteboardItem
 // require an NSString*.
 NSString* UTIFromPboardType(NSString* type) {
   return [base::mac::CFToNSCast(UTTypeCreatePreferredIdentifierForTag(
       kUTTagClassNSPboardType, base::mac::NSToCFCast(type), kUTTypeData))
       autorelease];
 }
 }  // namespace
@@ skipping 35 matching lines @@
   NSURL* base = [url baseURL];
   if (base) {
     [item setPropertyList:@[ [url relativeString], [base absoluteString] ]
                   forType:UTIFromPboardType(NSURLPboardType)];
   } else if (url) {
     [item setPropertyList:@[ [url absoluteString], @"" ]
                   forType:UTIFromPboardType(NSURLPboardType)];
   }
 
   [item setString:urlString forType:NSPasteboardTypeString];
-
-  [item setData:[urlString dataUsingEncoding:NSUTF8StringEncoding]
-        forType:UTIFromPboardType(kCorePasteboardFlavorType_url)];
-
-  [item setData:[title dataUsingEncoding:NSUTF8StringEncoding]
-        forType:UTIFromPboardType(kCorePasteboardFlavorType_urln)];
+  [item setString:urlString forType:kPublicUrl];
+  [item setString:title forType:kPublicUrlName];
   return item;
 }
 
 // static
 base::scoped_nsobject<NSPasteboardItem> ClipboardUtil::PasteboardItemFromUrls(
     NSArray* urls,
     NSArray* titles) {
   base::scoped_nsobject<NSPasteboardItem> item([[NSPasteboardItem alloc] init]);
 
   // Set Safari's URL + title arrays Pboard type.
   NSArray* urlsAndTitles = @[ urls, titles ];
   [item setPropertyList:urlsAndTitles
                 forType:UTIFromPboardType(kWebURLsWithTitlesPboardType)];
 
   return item;
 }
 
 // static
 base::scoped_nsobject<NSPasteboardItem> ClipboardUtil::PasteboardItemFromString(
     NSString* string) {
   base::scoped_nsobject<NSPasteboardItem> item([[NSPasteboardItem alloc] init]);
   [item setString:string forType:NSPasteboardTypeString];
   return item;
 }
 
 //static
 NSString* ClipboardUtil::GetTitleFromPasteboardURL(NSPasteboard* pboard) {
-  return
-      [pboard stringForType:UTIFromPboardType(kCorePasteboardFlavorType_urln)];
+  return [pboard stringForType:kPublicUrlName];
 }
 
 //static
 NSString* ClipboardUtil::GetURLFromPasteboardURL(NSPasteboard* pboard) {
-  return
-      [pboard stringForType:UTIFromPboardType(kCorePasteboardFlavorType_url)];
+  return [pboard stringForType:kPublicUrl];
 }
 
 // static
 NSString* ClipboardUtil::UTIForPasteboardType(NSString* type) {
   return UTIFromPboardType(type);
 }
 
 // static
 NSString* ClipboardUtil::UTIForWebURLsAndTitles() {
   return UTIFromPboardType(kWebURLsWithTitlesPboardType);
@@ skipping 48 matching lines @@
     if (![obj isKindOfClass:[NSString class]])
       return false;
   }
 
   *urls = urlsArr;
   *titles = titlesArr;
   return true;
 }
 
 }  // namespace ui