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

content/browser/web_contents/web_contents_view_android.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_contents_view_android.h"
 
 #include "base/logging.h"
 #include "content/browser/android/content_view_core_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_android.h"
 #include "content/browser/renderer_host/render_view_host_factory.h"
@@ skipping 106 matching lines @@
 }
 
 void WebContentsViewAndroid::StoreFocus() {
   NOTIMPLEMENTED();
 }
 
 void WebContentsViewAndroid::RestoreFocus() {
   NOTIMPLEMENTED();
 }
 
-WebDropData* WebContentsViewAndroid::GetDropData() const {
+DropData* WebContentsViewAndroid::GetDropData() const {
   NOTIMPLEMENTED();
   return NULL;
 }
 
 gfx::Rect WebContentsViewAndroid::GetViewBounds() const {
   RenderWidgetHostView* rwhv = web_contents_->GetRenderWidgetHostView();
   if (rwhv)
     return rwhv->GetViewBounds();
   else
     return gfx::Rect();
@@ skipping 53 matching lines @@
     const std::vector<WebMenuItem>& items,
     bool right_aligned,
     bool allow_multiple_selection) {
   if (content_view_core_) {
     content_view_core_->ShowSelectPopupMenu(
         items, selected_item, allow_multiple_selection);
   }
 }
 
 void WebContentsViewAndroid::StartDragging(
-    const WebDropData& drop_data,
+    const DropData& drop_data,
     WebKit::WebDragOperationsMask allowed_ops,
     const gfx::ImageSkia& image,
     const gfx::Vector2d& image_offset,
     const DragEventSourceInfo& event_info) {
   NOTIMPLEMENTED();
 }
 
 void WebContentsViewAndroid::UpdateDragCursor(WebKit::WebDragOperation op) {
   NOTIMPLEMENTED();
 }
 
 void WebContentsViewAndroid::GotFocus() {
   // This is only used in the views FocusManager stuff but it bleeds through
   // all subclasses. http://crbug.com/21875
 }
 
 // This is called when we the renderer asks us to take focus back (i.e., it has
 // iterated past the last focusable element on the page).
 void WebContentsViewAndroid::TakeFocus(bool reverse) {
   if (web_contents_->GetDelegate() &&
       web_contents_->GetDelegate()->TakeFocus(web_contents_, reverse))
     return;
   web_contents_->GetRenderWidgetHostView()->Focus();
 }
 
 } // namespace content