Remove FormatType usage from ClipboardHostMsg_IsFormatAvailable.

content/renderer/webclipboard_impl.cc

 // Copyright (c) 2013 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 "content/renderer/webclipboard_impl.h"
 
 #include "base/logging.h"
 #include "base/pickle.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
+#include "content/common/clipboard_format.h"
 #include "content/public/common/drop_data.h"
 #include "content/renderer/clipboard_utils.h"
 #include "content/renderer/drop_data_builder.h"
 #include "content/renderer/scoped_clipboard_writer_glue.h"
 #include "third_party/WebKit/public/platform/WebData.h"
 #include "third_party/WebKit/public/platform/WebDragData.h"
 #include "third_party/WebKit/public/platform/WebImage.h"
 #include "third_party/WebKit/public/platform/WebSize.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
@@ skipping 29 matching lines @@
 }
 
 bool WebClipboardImpl::isFormatAvailable(Format format, Buffer buffer) {
   ui::ClipboardType clipboard_type = ui::CLIPBOARD_TYPE_COPY_PASTE;
 
   if (!ConvertBufferType(buffer, &clipboard_type))
     return false;
 
   switch (format) {
     case FormatPlainText:
-      return client_->IsFormatAvailable(ui::Clipboard::GetPlainTextFormatType(),
-                                        clipboard_type) ||
-          client_->IsFormatAvailable(ui::Clipboard::GetPlainTextWFormatType(),
-                                     clipboard_type);
+      return client_->IsFormatAvailable(CLIPBOARD_FORMAT_PLAINTEXT,
+                                        clipboard_type);
     case FormatHTML:
-      return client_->IsFormatAvailable(ui::Clipboard::GetHtmlFormatType(),
+      return client_->IsFormatAvailable(CLIPBOARD_FORMAT_HTML, clipboard_type);
+    case FormatSmartPaste:
+      return client_->IsFormatAvailable(CLIPBOARD_FORMAT_SMART_PASTE,
                                         clipboard_type);
-    case FormatSmartPaste:
-      return client_->IsFormatAvailable(
-          ui::Clipboard::GetWebKitSmartPasteFormatType(), clipboard_type);
     case FormatBookmark:
-#if defined(OS_WIN) || defined(OS_MACOSX)
-      return client_->IsFormatAvailable(ui::Clipboard::GetUrlWFormatType(),
+      return client_->IsFormatAvailable(CLIPBOARD_FORMAT_BOOKMARK,
                                         clipboard_type);
-#endif
     default:
       NOTREACHED();
   }
 
   return false;
 }
 
 WebVector<WebString> WebClipboardImpl::readAvailableTypes(
     Buffer buffer, bool* contains_filenames) {
   ui::ClipboardType clipboard_type;
   std::vector<base::string16> types;
   if (ConvertBufferType(buffer, &clipboard_type)) {
     client_->ReadAvailableTypes(clipboard_type, &types, contains_filenames);
   }
   return types;
 }
 
 WebString WebClipboardImpl::readPlainText(Buffer buffer) {
   ui::ClipboardType clipboard_type;
   if (!ConvertBufferType(buffer, &clipboard_type))
     return WebString();
 
-  if (client_->IsFormatAvailable(ui::Clipboard::GetPlainTextWFormatType(),
-                                 clipboard_type)) {
-    base::string16 text;
-    client_->ReadText(clipboard_type, &text);
-    if (!text.empty())
-      return text;
-  }
-
-  if (client_->IsFormatAvailable(ui::Clipboard::GetPlainTextFormatType(),
-                                 clipboard_type)) {
-    std::string text;
-    client_->ReadAsciiText(clipboard_type, &text);
-    if (!text.empty())
-      return base::ASCIIToUTF16(text);
-  }
-
-  return WebString();
+  base::string16 text;
+  client_->ReadText(clipboard_type, &text);
+  return text;
 }
 
 WebString WebClipboardImpl::readHTML(Buffer buffer, WebURL* source_url,
                                      unsigned* fragment_start,
                                      unsigned* fragment_end) {
   ui::ClipboardType clipboard_type;
   if (!ConvertBufferType(buffer, &clipboard_type))
     return WebString();
 
   base::string16 html_stdstr;
@@ skipping 108 matching lines @@
 #endif
 #endif
     default:
       NOTREACHED();
       return false;
   }
   return true;
 }
 
 }  // namespace content