Revert of Implement ui::ClipboardMus.

ui/base/dragdrop/os_exchange_data_provider_aurax11.cc

Index: ui/base/dragdrop/os_exchange_data_provider_aurax11.cc
diff --git a/ui/base/dragdrop/os_exchange_data_provider_aurax11.cc b/ui/base/dragdrop/os_exchange_data_provider_aurax11.cc
index 60486709d1c9b4d33b3221205d19d010131681a2..e2bba47010817ff4a1abbbbb0ad93fa87c0fbe82 100644
--- a/ui/base/dragdrop/os_exchange_data_provider_aurax11.cc
+++ b/ui/base/dragdrop/os_exchange_data_provider_aurax11.cc
@@ -31,16 +31,18 @@
 
 const char kNetscapeURL[] = "_NETSCAPE_URL";
 
-const char* kAtomsToCache[] = {kString,
-                               kText,
-                               kUtf8String,
-                               kDndSelection,
-                               Clipboard::kMimeTypeURIList,
-                               Clipboard::kMimeTypeMozillaURL,
-                               kNetscapeURL,
-                               Clipboard::kMimeTypeText,
-                               kRendererTaint,
-                               nullptr};
+const char* kAtomsToCache[] = {
+  kString,
+  kText,
+  kUtf8String,
+  kDndSelection,
+  Clipboard::kMimeTypeURIList,
+  kMimeTypeMozillaURL,
+  kNetscapeURL,
+  Clipboard::kMimeTypeText,
+  kRendererTaint,
+  NULL
+};
 
 }  // namespace
 
@@ -154,8 +156,7 @@
     scoped_refptr<base::RefCountedMemory> mem(
         base::RefCountedBytes::TakeVector(&data));
 
-    format_map_.Insert(atom_cache_.GetAtom(Clipboard::kMimeTypeMozillaURL),
-                       mem);
+    format_map_.Insert(atom_cache_.GetAtom(kMimeTypeMozillaURL), mem);
 
     // Set a string fallback as well.
     SetString(spec);
@@ -254,7 +255,7 @@
     // but that doesn't match the assumptions of the rest of the system which
     // expect single types.
 
-    if (data.GetType() == atom_cache_.GetAtom(Clipboard::kMimeTypeMozillaURL)) {
+    if (data.GetType() == atom_cache_.GetAtom(kMimeTypeMozillaURL)) {
       // Mozilla URLs are (UTF16: URL, newline, title).
       base::string16 unparsed;
       data.AssignTo(&unparsed);
@@ -361,7 +362,7 @@
   // Windows does and stuffs all the data into one mime type.
   ui::SelectionData data(format_map_.GetFirstOf(requested_types));
   if (data.IsValid()) {
-    if (data.GetType() == atom_cache_.GetAtom(Clipboard::kMimeTypeMozillaURL)) {
+    if (data.GetType() == atom_cache_.GetAtom(kMimeTypeMozillaURL)) {
       // File managers shouldn't be using this type, so this is a URL.
       return true;
     } else if (data.GetType() == atom_cache_.GetAtom(
@@ -422,7 +423,7 @@
     const std::string& file_contents) {
   DCHECK(!filename.empty());
   DCHECK(format_map_.end() ==
-         format_map_.find(atom_cache_.GetAtom(Clipboard::kMimeTypeMozillaURL)));
+         format_map_.find(atom_cache_.GetAtom(kMimeTypeMozillaURL)));
 
   file_contents_name_ = filename;