Clipboard: Restrict Windows-only formats to Windows builds.

On the clipboard, MozUrl and Filename ClipboardFormatTypes are only
really used on Windows. Restricting this allows us to delete some code,
and make it more clear where these formats are (and are not) used.

Change-Id: Iead2dcac183147b3b6285f9a546e3a7e3f9d94a4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2413396
Commit-Queue: Darwin Huang <huangdarwin@chromium.org>
Auto-Submit: Darwin Huang <huangdarwin@chromium.org>
Reviewed-by: Victor Costan <pwnall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#808534}

ui/base/clipboard/clipboard_format_type.h

@@ -55,9 +55,7 @@ class COMPONENT_EXPORT(UI_BASE_CLIPBOARD_TYPES) ClipboardFormatType {
 
   // Get format identifiers for various types.
   static const ClipboardFormatType& GetUrlType();
-  static const ClipboardFormatType& GetMozUrlType();
   static const ClipboardFormatType& GetPlainTextType();
-  static const ClipboardFormatType& GetFilenameType();
   static const ClipboardFormatType& GetWebKitSmartPasteType();
   // Win: MS HTML Format, Other: Generic HTML format
   static const ClipboardFormatType& GetHtmlType();
@@ -84,7 +82,9 @@ class COMPONENT_EXPORT(UI_BASE_CLIPBOARD_TYPES) ClipboardFormatType {
   static const ClipboardFormatType& GetFileDescriptorType();
   static const ClipboardFormatType& GetFileContentZeroType();
   static const ClipboardFormatType& GetFileContentAtIndexType(LONG index);
+  static const ClipboardFormatType& GetFilenameType();
   static const ClipboardFormatType& GetIDListType();
+  static const ClipboardFormatType& GetMozUrlType();
 #endif
 
   // ClipboardFormatType can be used in a set on some platforms.

ui/base/clipboard/clipboard_format_type_aura.cc

@@ -8,10 +8,6 @@
 
 namespace ui {
 
-namespace {
-constexpr char kMimeTypeFilename[] = "chromium/filename";
-}
-
 // TODO(huangdarwin): Investigate creating a new clipboard_format_type_x11 as a
 // wrapper around an X11 ::Atom. This wasn't possible in the past, because unit
 // tests spawned a new X11 server for each test, meaning Atom numeric values
@@ -59,24 +55,12 @@ const ClipboardFormatType& ClipboardFormatType::GetUrlType() {
   return *type;
 }
 
-// static
-const ClipboardFormatType& ClipboardFormatType::GetMozUrlType() {
-  static base::NoDestructor<ClipboardFormatType> type(kMimeTypeMozillaURL);
-  return *type;
-}
-
 // static
 const ClipboardFormatType& ClipboardFormatType::GetPlainTextType() {
   static base::NoDestructor<ClipboardFormatType> type(kMimeTypeText);
   return *type;
 }
 
-// static
-const ClipboardFormatType& ClipboardFormatType::GetFilenameType() {
-  static base::NoDestructor<ClipboardFormatType> type(kMimeTypeFilename);
-  return *type;
-}
-
 // static
 const ClipboardFormatType& ClipboardFormatType::GetHtmlType() {
   static base::NoDestructor<ClipboardFormatType> type(kMimeTypeHTML);

ui/base/clipboard/clipboard_format_type_mac.mm

@@ -75,12 +75,6 @@ const ClipboardFormatType& ClipboardFormatType::GetPlainTextType() {
   return *type;
 }
 
-// static
-const ClipboardFormatType& ClipboardFormatType::GetFilenameType() {
-  static base::NoDestructor<ClipboardFormatType> type(NSFilenamesPboardType);
-  return *type;
-}
-
 // static
 const ClipboardFormatType& ClipboardFormatType::GetHtmlType() {
   static base::NoDestructor<ClipboardFormatType> type(NSHTMLPboardType);

ui/base/clipboard/clipboard_format_type_win.cc

@@ -173,26 +173,12 @@ const ClipboardFormatType& ClipboardFormatType::GetUrlType() {
   return *format;
 }
 
-// static
-const ClipboardFormatType& ClipboardFormatType::GetMozUrlType() {
-  static base::NoDestructor<ClipboardFormatType> format(
-      ::RegisterClipboardFormat(L"text/x-moz-url"));
-  return *format;
-}
-
 // static
 const ClipboardFormatType& ClipboardFormatType::GetPlainTextType() {
   static base::NoDestructor<ClipboardFormatType> format(CF_UNICODETEXT);
   return *format;
 }
 
-// static
-const ClipboardFormatType& ClipboardFormatType::GetFilenameType() {
-  static base::NoDestructor<ClipboardFormatType> format(
-      ::RegisterClipboardFormat(CFSTR_FILENAMEW));
-  return *format;
-}
-
 // MS HTML Format
 
 // static
@@ -311,6 +297,13 @@ const ClipboardFormatType& ClipboardFormatType::GetFileContentAtIndexType(
   return insert_or_assign_result.first->second;
 }
 
+// static
+const ClipboardFormatType& ClipboardFormatType::GetFilenameType() {
+  static base::NoDestructor<ClipboardFormatType> format(
+      ::RegisterClipboardFormat(CFSTR_FILENAMEW));
+  return *format;
+}
+
 // static
 const ClipboardFormatType& ClipboardFormatType::GetIDListType() {
   static base::NoDestructor<ClipboardFormatType> format(
@@ -318,6 +311,13 @@ const ClipboardFormatType& ClipboardFormatType::GetIDListType() {
   return *format;
 }
 
+// static
+const ClipboardFormatType& ClipboardFormatType::GetMozUrlType() {
+  static base::NoDestructor<ClipboardFormatType> format(
+      ::RegisterClipboardFormat(L"text/x-moz-url"));
+  return *format;
+}
+
 // static
 const ClipboardFormatType& ClipboardFormatType::GetWebKitSmartPasteType() {
   static base::NoDestructor<ClipboardFormatType> format(