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

webkit/common/webdropdata.h

Index: webkit/common/webdropdata.h
diff --git a/webkit/common/webdropdata.h b/webkit/common/webdropdata.h
deleted file mode 100644
index 293e2bb2f14e436d821df9e4e6de99004abae3bd..0000000000000000000000000000000000000000
--- a/webkit/common/webdropdata.h
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright 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.
-//
-// A struct for managing data being dropped on a webview.  This represents a
-// union of all the types of data that can be dropped in a platform neutral
-// way.
-
-#ifndef WEBKIT_COMMON_WEBDROPDATA_H_
-#define WEBKIT_COMMON_WEBDROPDATA_H_
-
-#include <map>
-#include <string>
-#include <vector>
-
-#include "base/strings/nullable_string16.h"
-#include "base/strings/string16.h"
-#include "third_party/WebKit/public/platform/WebReferrerPolicy.h"
-#include "url/gurl.h"
-#include "webkit/common/webkit_common_export.h"
-
-struct IDataObject;
-
-namespace WebKit {
-class WebDragData;
-}
-
-struct WEBKIT_COMMON_EXPORT WebDropData {
-  // The struct is used to represent a file in the drop data.
-  struct WEBKIT_COMMON_EXPORT FileInfo {
-    FileInfo();
-    FileInfo(const base::string16& path, const base::string16& display_name);
-
-    // The path of the file.
-    base::string16 path;
-    // The display name of the file. This field is optional.
-    base::string16 display_name;
-  };
-
-  // Construct from a WebDragData object.
-  explicit WebDropData(const WebKit::WebDragData&);
-
-  WebDropData();
-
-  ~WebDropData();
-
-  // User is dragging a link into the webview.
-  GURL url;
-  base::string16 url_title;  // The title associated with |url|.
-
-  // User is dragging a link out-of the webview.
-  base::string16 download_metadata;
-
-  // Referrer policy to use when dragging a link out of the webview results in
-  // a download.
-  WebKit::WebReferrerPolicy referrer_policy;
-
-  // User is dropping one or more files on the webview.
-  std::vector<FileInfo> filenames;
-
-  // Isolated filesystem ID for the files being dragged on the webview.
-  base::string16 filesystem_id;
-
-  // User is dragging plain text into the webview.
-  base::NullableString16 text;
-
-  // User is dragging text/html into the webview (e.g., out of Firefox).
-  // |html_base_url| is the URL that the html fragment is taken from (used to
-  // resolve relative links).  It's ok for |html_base_url| to be empty.
-  base::NullableString16 html;
-  GURL html_base_url;
-
-  // User is dragging data from the webview (e.g., an image).
-  base::string16 file_description_filename;
-  std::string file_contents;
-
-  std::map<base::string16, base::string16> custom_data;
-};
-
-#endif  // WEBKIT_COMMON_WEBDROPDATA_H_