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

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/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"
 #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"
 #include "third_party/WebKit/public/platform/WebVector.h"
 #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"
 
 using WebKit::WebClipboard;
 using WebKit::WebData;
 using WebKit::WebDragData;
 using WebKit::WebImage;
 using WebKit::WebString;
 using WebKit::WebURL;
 using WebKit::WebVector;
@@ skipping 167 matching lines @@
     // http://crbug.com/33016 for details.
     scw.WriteHTML(UTF8ToUTF16(webkit_clipboard::URLToImageMarkup(url, title)),
                   std::string());
 #endif
   }
 }
 
 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());
   if (!data_object.html.is_null())
     scw.WriteHTML(data_object.html.string(), std::string());
   // If there is no custom data, avoid calling WritePickledData. This ensures
   // that ScopedClipboardWriterGlue's dtor remains a no-op if the page didn't
   // modify the DataTransfer object, which is important to avoid stomping on
   // any clipboard contents written by extension functions such as
   // chrome.bookmarkManagerPrivate.copy.
@@ skipping 23 matching lines @@
 #endif
     default:
       NOTREACHED();
       return false;
   }
   return true;
 }
 
 }  // namespace content