Fix Chrome OS drag and drop

Partial revert of crrev.com/c/2461372 where changes should have only
applied to OS_LINUX and not OS_CHROMEOS.

Bug: 1144979
Change-Id: I752783a181afa8c40e73e883b2906cfd5da1e7d3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2515806Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Joel Hockey <joelhockey@chromium.org>
Cr-Commit-Position: refs/heads/master@{#823687}

content/browser/web_contents/web_contents_view_aura_unittest.cc

@@ -41,7 +41,7 @@ namespace {
 constexpr gfx::Rect kBounds = gfx::Rect(0, 0, 20, 20);
 constexpr gfx::PointF kClientPt = {5, 10};
 
-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN)
+#if defined(OS_LINUX) || defined(OS_WIN)
 constexpr gfx::PointF kScreenPt = {17, 3};
 #endif
 
@@ -200,7 +200,7 @@ TEST_F(WebContentsViewAuraTest, OccludeView) {
   EXPECT_EQ(web_contents()->GetVisibility(), Visibility::VISIBLE);
 }
 
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_WIN)
+#if defined(OS_LINUX) || defined(OS_WIN)
 TEST_F(WebContentsViewAuraTest, DragDropFiles) {
   WebContentsViewAura* view = GetView();
   auto data = std::make_unique<ui::OSExchangeData>();
@@ -285,9 +285,6 @@ TEST_F(WebContentsViewAuraTest, DragDropFiles) {
   }
 }
 
-#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_WIN)
-
-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN)
 TEST_F(WebContentsViewAuraTest, DragDropFilesOriginateFromRenderer) {
   WebContentsViewAura* view = GetView();
   auto data = std::make_unique<ui::OSExchangeData>();
@@ -327,7 +324,7 @@ TEST_F(WebContentsViewAuraTest, DragDropFilesOriginateFromRenderer) {
   view->OnDragEntered(event);
   ASSERT_NE(nullptr, view->current_drop_data_);
 
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if defined(OS_LINUX)
   // By design, Linux implementations return an empty string if file data
   // is also present.
   EXPECT_TRUE(!view->current_drop_data_->text ||
@@ -351,7 +348,7 @@ TEST_F(WebContentsViewAuraTest, DragDropFilesOriginateFromRenderer) {
 
   CheckDropData(view);
 
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if defined(OS_LINUX)
   // By design, Linux implementations returns an empty string if file data is
   // also present.
   EXPECT_TRUE(!drop_complete_data_->drop_data.text ||

ui/base/dragdrop/os_exchange_data_provider_non_backed.cc

@@ -41,11 +41,19 @@ std::unique_ptr<OSExchangeDataProvider> OSExchangeDataProviderNonBacked::Clone()
 }
 
 void OSExchangeDataProviderNonBacked::MarkOriginatedFromRenderer() {
+  // TODO(dcheng): Currently unneeded because ChromeOS Aura correctly separates
+  // URL and filename metadata, and does not implement the DownloadURL protocol.
+#if !defined(OS_CHROMEOS)
   originated_from_renderer_ = true;
+#endif
 }
 
 bool OSExchangeDataProviderNonBacked::DidOriginateFromRenderer() const {
+#if defined(OS_CHROMEOS)
+  return false;
+#else
   return originated_from_renderer_;
+#endif
 }
 
 void OSExchangeDataProviderNonBacked::SetString(const base::string16& data) {

ui/base/dragdrop/os_exchange_data_provider_non_backed.h

@@ -110,7 +110,9 @@ class COMPONENT_EXPORT(UI_BASE) OSExchangeDataProviderNonBacked
   base::string16 html_;
   GURL base_url_;
 
+#if !defined(OS_CHROMEOS)
   bool originated_from_renderer_ = false;
+#endif
 
   // Data source.
   std::unique_ptr<DataTransferEndpoint> source_;