Remove FormatType usage from ClipboardHostMsg_IsFormatAvailable.

content/renderer/clipboard_client.h

 // 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.
 
 #ifndef CONTENT_RENDERER_CLIPBOARD_CLIENT_H_
 #define CONTENT_RENDERER_CLIPBOARD_CLIENT_H_
 
+#include "content/common/clipboard_message_enums.h"
 #include "ui/base/clipboard/clipboard.h"
 
 class GURL;
 
 namespace content {
 
 // Interface for the content embedder to implement to support clipboard.
 class ClipboardClient {
  public:
   class WriteContext {
@@ skipping 11 matching lines @@
 
   virtual ~ClipboardClient() { }
 
   // Get a clipboard that can be used to construct a ScopedClipboardWriterGlue.
   virtual ui::Clipboard* GetClipboard() = 0;
 
   // Get a sequence number which uniquely identifies clipboard state.
   virtual uint64 GetSequenceNumber(ui::ClipboardType type) = 0;
 
   // Tests whether the clipboard contains a certain format
-  virtual bool IsFormatAvailable(const ui::Clipboard::FormatType& format,
+  virtual bool IsFormatAvailable(content::ClipboardFormat format,

[jam, 2014/03/20 16:07:08]

nit: no "content::" since this is in the content namespace

[dcheng, 2014/03/20 17:52:06]

Done.

                                  ui::ClipboardType type) = 0;
 
   // Clear the contents of the clipboard.
   virtual void Clear(ui::ClipboardType type) = 0;
 
   // Reads the available types from the clipboard, if available.
   virtual void ReadAvailableTypes(ui::ClipboardType type,
                                   std::vector<base::string16>* types,
                                   bool* contains_filenames) = 0;
 
-  // Reads UNICODE text from the clipboard, if available.
+  // Reads text from the clipboard, trying UNICODE first, then falling back to
+  // ASCII.
   virtual void ReadText(ui::ClipboardType type,
                         base::string16* result) = 0;
 
-  // Reads ASCII text from the clipboard, if available.
-  virtual void ReadAsciiText(ui::ClipboardType type,
-                             std::string* result) = 0;
-
   // Reads HTML from the clipboard, if available.
   virtual void ReadHTML(ui::ClipboardType type,
                         base::string16* markup,
                         GURL* url,
                         uint32* fragment_start,
                         uint32* fragment_end) = 0;
 
   // Reads RTF from the clipboard, if available.
   virtual void ReadRTF(ui::ClipboardType type, std::string* result) = 0;
 
@@ skipping 10 matching lines @@
                         std::string* data) = 0;
 
   // Creates a context to write clipboard data. May return NULL.
   virtual WriteContext* CreateWriteContext() = 0;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_CLIPBOARD_CLIENT_H_