MacViews: Get OSExchangeDataTest to pass

ui/base/dragdrop/os_exchange_data_provider_mac.mm

Index: ui/base/dragdrop/os_exchange_data_provider_mac.mm
diff --git a/ui/base/dragdrop/os_exchange_data_provider_mac.mm b/ui/base/dragdrop/os_exchange_data_provider_mac.mm
index 096b8066209089cce5ff82ab57b3b8c6a7011bc3..3822a9a1c442eff932902c2a1867192174c59e2a 100644
--- a/ui/base/dragdrop/os_exchange_data_provider_mac.mm
+++ b/ui/base/dragdrop/os_exchange_data_provider_mac.mm
@@ -10,7 +10,6 @@
 #include "base/pickle.h"
 #include "base/strings/sys_string_conversions.h"
 #import "third_party/mozilla/NSPasteboard+Utils.h"
-#import "ui/base/dragdrop/cocoa_dnd_util.h"
 #include "url/gurl.h"
 
 namespace ui {
@@ -45,12 +44,16 @@ void OSExchangeDataProviderMac::SetString(const base::string16& string) {
 
 void OSExchangeDataProviderMac::SetURL(const GURL& url,
                                        const base::string16& title) {
-  [pasteboard_ setDataForURL:base::SysUTF8ToNSString(url.spec())
-                       title:base::SysUTF16ToNSString(title)];
+  NSURL* ns_url = [NSURL URLWithString:base::SysUTF8ToNSString(url.spec())];
+  [pasteboard_ writeObjects:@[ ns_url ]];
+
+  [pasteboard_ setString:base::SysUTF16ToNSString(title)
+                 forType:kCorePasteboardFlavorType_urln];
 }
 
 void OSExchangeDataProviderMac::SetFilename(const base::FilePath& path) {
-  NOTIMPLEMENTED();
+  [pasteboard_ setPropertyList:@[ base::SysUTF8ToNSString(path.value()) ]
+                       forType:NSFilenamesPboardType];
 }
 
 void OSExchangeDataProviderMac::SetFilenames(
@@ -80,13 +83,38 @@ bool OSExchangeDataProviderMac::GetURLAndTitle(
     OSExchangeData::FilenameToURLPolicy policy,
     GURL* url,
     base::string16* title) const {
-  return PopulateURLAndTitleFromPasteboard(
-      url, title, pasteboard_, policy == OSExchangeData::CONVERT_FILENAMES);
+  NSArray* items = [pasteboard_ readObjectsForClasses:@[ [NSURL class] ]
+                                              options:@{ }];
+  if ([items count] == 0)
+    return false;
+
+  NSURL* ns_url = [items objectAtIndex:0];
+
+  if (policy == OSExchangeData::DO_NOT_CONVERT_FILENAMES) {
+    // If the URL matches the filename, assume that it came from SetFilename().
+    // Don't return it if we are not supposed to convert filename to URL.
+    NSArray* paths = [pasteboard_ propertyListForType:NSFilenamesPboardType];
+    if ([paths containsObject:[ns_url path]])

[dcheng, 2014/09/23 17:49:10]

Do we need to try to normalize/canonicalize the paths before comparing them
here? What if we have file:///Users/foo/x.html as the URL and /Users/foo//x.html
as the filename? Is there some canonicalization that's guaranteed to happen
elsewhere?

[Andre, 2014/09/24 01:12:40]

Done.
Added calls to stringByStandardizingPath before comparing.

+      return false;
+  }
+
+  if (url) {
+    *url = GURL([[ns_url absoluteString] UTF8String]);
+  }
+  if (title) {
+    *title = base::SysNSStringToUTF16(
+        [pasteboard_ stringForType:kCorePasteboardFlavorType_urln]);
+  }
+  return true;
 }
 
 bool OSExchangeDataProviderMac::GetFilename(base::FilePath* path) const {
-  NOTIMPLEMENTED();
-  return false;
+  NSArray* paths = [pasteboard_ propertyListForType:NSFilenamesPboardType];
+  if ([paths count] == 0)
+    return false;
+
+  *path = base::FilePath([[paths objectAtIndex:0] UTF8String]);
+  return true;
 }
 
 bool OSExchangeDataProviderMac::GetFilenames(
@@ -114,14 +142,11 @@ bool OSExchangeDataProviderMac::HasString() const {
 
 bool OSExchangeDataProviderMac::HasURL(
     OSExchangeData::FilenameToURLPolicy policy) const {
-  GURL url;
-  base::string16 title;
-  return GetURLAndTitle(policy, &url, &title);
+  return GetURLAndTitle(policy, NULL, NULL);
 }
 
 bool OSExchangeDataProviderMac::HasFile() const {
-  NOTIMPLEMENTED();
-  return false;
+  return [[pasteboard_ types] containsObject:NSFilenamesPboardType];
 }
 
 bool OSExchangeDataProviderMac::HasCustomFormat(