Move WebDropData to content::DropData and split off conversion function.

content/renderer/webclipboard_impl.cc

Index: content/renderer/webclipboard_impl.cc
diff --git a/content/renderer/webclipboard_impl.cc b/content/renderer/webclipboard_impl.cc
index 7ba388d6ee7c3382291e0ad652f98ed5b4f25098..78e0a800bcece9c68334e36717214ce6721a26b2 100644
--- a/content/renderer/webclipboard_impl.cc
+++ b/content/renderer/webclipboard_impl.cc
@@ -8,6 +8,8 @@
 #include "base/pickle.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
+#include "content/public/common/drop_data.h"
+#include "content/renderer/drop_data_builder.h"
 #include "content/renderer/scoped_clipboard_writer_glue.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/WebKit/public/platform/WebData.h"
@@ -20,7 +22,6 @@
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/clipboard/custom_data_helper.h"
-#include "webkit/common/webdropdata.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/renderer/clipboard_utils.h"
 
@@ -208,7 +209,7 @@ void WebClipboardImpl::writeImage(
 void WebClipboardImpl::writeDataObject(const WebDragData& data) {
   ScopedClipboardWriterGlue scw(client_);
 
-  WebDropData data_object(data);
+  const DropData& data_object = DropDataBuilder::Build(data);
   // TODO(dcheng): Properly support text/uri-list here.
   if (!data_object.text.is_null())
     scw.WriteText(data_object.text.string());