mac: Fix copying 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 {
@@ skipping 49 matching lines @@
   // https://github.com/WebKit/webkit/blob/master/Source/WebCore/platform/mac/PlatformPasteboardMac.mm
   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:UTIFromPboardType(NSStringPboardType)];
+  [item setString:urlString forType:NSPasteboardTypeString];
 
   [item setData:[urlString dataUsingEncoding:NSUTF8StringEncoding]
         forType:UTIFromPboardType(kCorePasteboardFlavorType_url)];
 
   [item setData:[title dataUsingEncoding:NSUTF8StringEncoding]
         forType:UTIFromPboardType(kCorePasteboardFlavorType_urln)];
   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:UTIFromPboardType(NSStringPboardType)];
+  [item setString:string forType:NSPasteboardTypeString];
   return item;
 }
 
 //static
 NSString* ClipboardUtil::GetTitleFromPasteboardURL(NSPasteboard* pboard) {
   return
       [pboard stringForType:UTIFromPboardType(kCorePasteboardFlavorType_urln)];
 }
 
 //static
@@ skipping 61 matching lines @@
     if (![obj isKindOfClass:[NSString class]])
       return false;
   }
 
   *urls = urlsArr;
   *titles = titlesArr;
   return true;
 }
 
 }  // namespace ui