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

content/browser/web_contents/web_drag_dest_gtk.cc

 // Copyright (c) 2012 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/browser/web_contents/web_drag_dest_gtk.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
@@ skipping 92 matching lines @@
 
   drop_data_.reset();
 }
 
 gboolean WebDragDestGtk::OnDragMotion(GtkWidget* sender,
                                       GdkDragContext* context,
                                       gint x, gint y,
                                       guint time) {
   if (context_ != context) {
     context_ = context;
-    drop_data_.reset(new WebDropData);
+    drop_data_.reset(new DropData);
     is_drop_target_ = false;
 
     if (delegate())
       delegate()->DragInitialize(web_contents_);
 
     // text/plain must come before text/uri-list. This is a hack that works in
     // conjunction with OnDragDataReceived. Since some file managers populate
     // text/plain with file URLs when dragging files, we want to handle
     // text/uri-list after text/plain so that the plain text can be cleared if
     // it's a file drag.
@@ skipping 73 matching lines @@
         for (gchar** uri_iter = uris; *uri_iter; uri_iter++) {
           // Most file managers populate text/uri-list with file URLs when
           // dragging files. To avoid exposing file system paths to web content,
           // file URLs are never set as the URL content for the drop.
           // TODO(estade): Can the filenames have a non-UTF8 encoding?
           GURL url(*uri_iter);
           base::FilePath file_path;
           if (url.SchemeIs(chrome::kFileScheme) &&
               net::FileURLToFilePath(url, &file_path)) {
             drop_data_->filenames.push_back(
-                WebDropData::FileInfo(UTF8ToUTF16(file_path.value()),
-                                      string16()));
+                DropData::FileInfo(UTF8ToUTF16(file_path.value()), string16()));
             // This is a hack. Some file managers also populate text/plain with
             // a file URL when dragging files, so we clear it to avoid exposing
             // it to the web content.
             drop_data_->text = base::NullableString16();
           } else if (!drop_data_->url.is_valid()) {
             // Also set the first non-file URL as the URL content for the drop.
             drop_data_->url = url;
           }
         }
         g_strfreev(uris);
@@ skipping 111 matching lines @@
   gtk_drag_finish(context, is_drop_target_, FALSE, time);
 
   return TRUE;
 }
 
 RenderViewHostImpl* WebDragDestGtk::GetRenderViewHost() const {
   return static_cast<RenderViewHostImpl*>(web_contents_->GetRenderViewHost());
 }
 
 }  // namespace content