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

chrome/browser/ui/webui/extensions/install_extension_handler.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 "chrome/browser/ui/webui/extensions/install_extension_handler.h"
 
 #include "base/bind.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/extension_install_prompt.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/feature_switch.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"
+#include "content/public/common/drop_data.h"
 #include "grit/generated_resources.h"
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "webkit/common/webdropdata.h"
 
 InstallExtensionHandler::InstallExtensionHandler() {
 }
 
 InstallExtensionHandler::~InstallExtensionHandler() {
 }
 
 void InstallExtensionHandler::GetLocalizedValues(
     content::WebUIDataSource* source) {
   source->AddString(
@@ skipping 13 matching lines @@
       "stopDrag",
       base::Bind(&InstallExtensionHandler::HandleStopDragMessage,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback(
       "installDroppedFile",
       base::Bind(&InstallExtensionHandler::HandleInstallMessage,
                  base::Unretained(this)));
 }
 
 void InstallExtensionHandler::HandleStartDragMessage(const ListValue* args) {
-  WebDropData* drop_data = web_ui()->GetWebContents()->GetView()->GetDropData();
+  content::DropData* drop_data =
+      web_ui()->GetWebContents()->GetView()->GetDropData();
   if (!drop_data) {
     DLOG(ERROR) << "No current drop data.";
     return;
   }
 
   if (drop_data->filenames.empty()) {
     DLOG(ERROR) << "Current drop data contains no files.";
     return;
   }
 
-  const WebDropData::FileInfo& file_info = drop_data->filenames.front();
+  const content::DropData::FileInfo& file_info = drop_data->filenames.front();
 
   file_to_install_ = base::FilePath::FromWStringHack(
       UTF16ToWide(file_info.path));
   // Use the display name if provided, for checking file names
   // (.path is likely a random hash value in that case).
   file_display_name_ =
       file_info.display_name.empty() ? file_info.path : file_info.display_name;
 }
 
 void InstallExtensionHandler::HandleStopDragMessage(const ListValue* args) {
@@ skipping 28 matching lines @@
                       ASCIIToUTF16(".crx"),
                       kCaseSensitive)) {
     crx_installer->InstallCrx(file_to_install_);
   } else {
     CHECK(false);
   }
 
   file_to_install_.clear();
   file_display_name_.clear();
 }