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

content/browser/renderer_host/render_view_host_unittest.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 "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/child_process_security_policy_impl.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
 #include "content/browser/web_contents/navigation_controller_impl.h"
 #include "content/common/input_messages.h"
 #include "content/common/view_messages.h"
 #include "content/port/browser/render_view_host_delegate_view.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/common/bindings_policy.h"
+#include "content/public/common/drop_data.h"
 #include "content/public/common/page_transition_types.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "content/test/test_content_browser_client.h"
 #include "content/test/test_web_contents.h"
 #include "net/base/net_util.h"
 #include "third_party/WebKit/public/web/WebDragOperation.h"
-#include "webkit/common/webdropdata.h"
 
 namespace content {
 
 class RenderViewHostTestBrowserClient : public TestContentBrowserClient {
  public:
   RenderViewHostTestBrowserClient() {}
   virtual ~RenderViewHostTestBrowserClient() {}
 
   virtual bool IsHandledURL(const GURL& url) OVERRIDE {
     return url.scheme() == chrome::kFileScheme;
@@ skipping 85 matching lines @@
     : public RenderViewHostDelegateView {
  public:
   virtual ~MockDraggingRenderViewHostDelegateView() {}
   virtual void ShowPopupMenu(const gfx::Rect& bounds,
                              int item_height,
                              double item_font_size,
                              int selected_item,
                              const std::vector<WebMenuItem>& items,
                              bool right_aligned,
                              bool allow_multiple_selection) OVERRIDE {}
-  virtual void StartDragging(const WebDropData& drop_data,
+  virtual void StartDragging(const DropData& drop_data,
                              WebKit::WebDragOperationsMask allowed_ops,
                              const gfx::ImageSkia& image,
                              const gfx::Vector2d& image_offset,
                              const DragEventSourceInfo& event_info) OVERRIDE {
     drag_url_ = drop_data.url;
     html_base_url_ = drop_data.html_base_url;
   }
   virtual void UpdateDragCursor(WebKit::WebDragOperation operation) OVERRIDE {}
   virtual void GotFocus() OVERRIDE {}
   virtual void TakeFocus(bool reverse) OVERRIDE {}
@@ skipping 10 matching lines @@
  private:
   GURL drag_url_;
   GURL html_base_url_;
 };
 
 TEST_F(RenderViewHostTest, StartDragging) {
   TestWebContents* web_contents = contents();
   MockDraggingRenderViewHostDelegateView delegate_view;
   web_contents->set_delegate_view(&delegate_view);
 
-  WebDropData drop_data;
+  DropData drop_data;
   GURL file_url = GURL("file:///home/user/secrets.txt");
   drop_data.url = file_url;
   drop_data.html_base_url = file_url;
   test_rvh()->TestOnStartDragging(drop_data);
   EXPECT_EQ(GURL("about:blank"), delegate_view.drag_url());
   EXPECT_EQ(GURL("about:blank"), delegate_view.html_base_url());
 
   GURL http_url = GURL("http://www.domain.com/index.html");
   drop_data.url = http_url;
   drop_data.html_base_url = http_url;
@@ skipping 10 matching lines @@
 
   GURL javascript_url = GURL("javascript:alert('I am a bookmarklet')");
   drop_data.url = javascript_url;
   drop_data.html_base_url = http_url;
   test_rvh()->TestOnStartDragging(drop_data);
   EXPECT_EQ(javascript_url, delegate_view.drag_url());
   EXPECT_EQ(http_url, delegate_view.html_base_url());
 }
 
 TEST_F(RenderViewHostTest, DragEnteredFileURLsStillBlocked) {
-  WebDropData dropped_data;
+  DropData dropped_data;
   gfx::Point client_point;
   gfx::Point screen_point;
   // We use "//foo/bar" path (rather than "/foo/bar") since dragged paths are
   // expected to be absolute on any platforms.
   base::FilePath highlighted_file_path(FILE_PATH_LITERAL("//tmp/foo.html"));
   base::FilePath dragged_file_path(FILE_PATH_LITERAL("//tmp/image.jpg"));
   base::FilePath sensitive_file_path(FILE_PATH_LITERAL("//etc/passwd"));
   GURL highlighted_file_url = net::FilePathToFileURL(highlighted_file_path);
   GURL dragged_file_url = net::FilePathToFileURL(dragged_file_path);
   GURL sensitive_file_url = net::FilePathToFileURL(sensitive_file_path);
   dropped_data.url = highlighted_file_url;
-  dropped_data.filenames.push_back(WebDropData::FileInfo(
+  dropped_data.filenames.push_back(DropData::FileInfo(
       UTF8ToUTF16(dragged_file_path.AsUTF8Unsafe()), string16()));
 
   rvh()->DragTargetDragEnter(dropped_data, client_point, screen_point,
                               WebKit::WebDragOperationNone, 0);
 
   int id = process()->GetID();
   ChildProcessSecurityPolicyImpl* policy =
       ChildProcessSecurityPolicyImpl::GetInstance();
 
   EXPECT_FALSE(policy->CanRequestURL(id, highlighted_file_url));
@@ skipping 77 matching lines @@
       process()->GetID(), file_path,
       base::PLATFORM_FILE_OPEN |
       base::PLATFORM_FILE_READ |
       base::PLATFORM_FILE_EXCLUSIVE_READ |
       base::PLATFORM_FILE_ASYNC);
   test_rvh()->SendNavigateWithFile(process()->GetID(), url, file_path);
   EXPECT_EQ(1, process()->bad_msg_count());
 }
 
 }  // namespace content