Cleaned up the clipboard constants, removed redundant files.

This CL completes the cleanup started in [1].  No changes to any behaviour are intented.

[1] https://chromium-review.googlesource.com/c/chromium/src/+/2352803

Bug: 1105892
Change-Id: Ieb2fe38fb54339d7a24e3ced6c30aea9991e1701
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2352897Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Scott Violet <sky@chromium.org>
Auto-Submit: Alexander Dunaev <adunaev@igalia.com>
Cr-Commit-Position: refs/heads/master@{#798686}

components/exo/mime_utils.cc

@@ -17,7 +17,7 @@ constexpr char kEncodingUTF8Charset[] = "UTF-8";
 namespace exo {
 
 std::string GetCharset(const std::string& mime_type) {
-  // We special case UTF8_STRING to provide minimal handling of X11 apps.
+  // We special case UTF-8 to provide minimal handling of X11 apps.
   if (mime_type == ui::kMimeTypeLinuxUtf8String)
     return std::string(kEncodingUTF8Charset);
 

ui/base/clipboard/clipboard_constants.cc

@@ -15,6 +15,12 @@ const char kMimeTypeHTML[] = "text/html";
 const char kMimeTypeRTF[] = "text/rtf";
 const char kMimeTypePNG[] = "image/png";
 
+#if defined(OS_LINUX) || defined(OS_FUCHSIA)
+const char kMimeTypeLinuxUtf8String[] = "UTF8_STRING";
+const char kMimeTypeLinuxString[] = "STRING";
+const char kMimeTypeLinuxText[] = "TEXT";
+#endif  // defined(OS_LINUX) || defined(OS_FUCHSIA)
+
 #if !defined(OS_APPLE)
 const char kMimeTypeWebCustomData[] = "chromium/x-web-custom-data";
 const char kMimeTypeWebkitSmartPaste[] = "chromium/x-webkit-paste";

ui/base/clipboard/clipboard_constants.h

@@ -38,11 +38,11 @@ COMPONENT_EXPORT(UI_BASE_CLIPBOARD_TYPES) extern const char kMimeTypePNG[];
 // Linux-specific MIME type constants (also used in Fuchsia).
 #if defined(OS_LINUX) || defined(OS_FUCHSIA)
 COMPONENT_EXPORT(UI_BASE_CLIPBOARD_TYPES)
-constexpr char kMimeTypeLinuxUtf8String[] = "UTF8_STRING";
+extern const char kMimeTypeLinuxUtf8String[];
 COMPONENT_EXPORT(UI_BASE_CLIPBOARD_TYPES)
-constexpr char kMimeTypeLinuxString[] = "STRING";
+extern const char kMimeTypeLinuxString[];
 COMPONENT_EXPORT(UI_BASE_CLIPBOARD_TYPES)
-constexpr char kMimeTypeLinuxText[] = "TEXT";
+extern const char kMimeTypeLinuxText[];
 #endif  // defined(OS_LINUX) || defined(OS_FUCHSIA)
 
 #if !defined(OS_APPLE)
@@ -76,7 +76,8 @@ extern NSString* const kUTTypeConfidentialData;
 #endif  // defined(OS_APPLE)
 
 #if defined(OS_ANDROID)
-COMPONENT_EXPORT(UI_BASE_CLIPBOARD_TYPES) extern const char kMimeTypeImageURI[];
+COMPONENT_EXPORT(UI_BASE_CLIPBOARD_TYPES)
+extern const char kMimeTypeImageURI[];
 #endif  // defined(OS_ANDROID)
 
 }  // namespace ui

ui/ozone/platform/wayland/BUILD.gn

@@ -239,7 +239,6 @@ source_set("test_support") {
   testonly = true
 
   sources = [
-    "test/constants.h",
     "test/global_object.cc",
     "test/global_object.h",
     "test/mock_buffer.cc",

ui/ozone/platform/wayland/host/wayland_data_device_unittest.cc

@@ -15,7 +15,6 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/clipboard/clipboard_constants.h"
 #include "ui/events/base_event_utils.h"
-#include "ui/ozone/platform/wayland/test/constants.h"
 #include "ui/ozone/platform/wayland/test/mock_surface.h"
 #include "ui/ozone/platform/wayland/test/test_data_device.h"
 #include "ui/ozone/platform/wayland/test/test_data_device_manager.h"
@@ -32,6 +31,8 @@ namespace ui {
 
 namespace {
 
+constexpr char kSampleClipboardText[] = "This is a sample text for clipboard.";
+
 template <typename StringType>
 ui::PlatformClipboard::Data ToClipboardData(const StringType& data_string) {
   std::vector<uint8_t> data_vector;
@@ -113,12 +114,12 @@ class WaylandDataDeviceManagerTest : public WaylandTest {
 TEST_P(WaylandDataDeviceManagerTest, WriteToClipboard) {
   // The client writes data to the clipboard ...
   std::vector<uint8_t> data_vector(
-      wl::kSampleClipboardText,
-      wl::kSampleClipboardText + strlen(wl::kSampleClipboardText));
+      kSampleClipboardText,
+      kSampleClipboardText + strlen(kSampleClipboardText));
   clipboard_client_->SetData(
       scoped_refptr<base::RefCountedBytes>(
           base::RefCountedBytes::TakeVector(&data_vector)),
-      {wl::kTextMimeTypeUtf8}, base::BindOnce([]() {}));
+      {kMimeTypeTextUtf8}, base::BindOnce([]() {}));
   Sync();
 
   // ... and the server reads it.
@@ -126,11 +127,11 @@ TEST_P(WaylandDataDeviceManagerTest, WriteToClipboard) {
   auto callback = base::BindOnce(
       [](base::RunLoop* loop, std::vector<uint8_t>&& data) {
         std::string string_data(data.begin(), data.end());
-        EXPECT_EQ(wl::kSampleClipboardText, string_data);
+        EXPECT_EQ(kSampleClipboardText, string_data);
         loop->Quit();
       },
       &run_loop);
-  data_device_manager_->data_source()->ReadData(wl::kTextMimeTypeUtf8,
+  data_device_manager_->data_source()->ReadData(kMimeTypeTextUtf8,
                                                 std::move(callback));
   run_loop.Run();
 }
@@ -139,8 +140,8 @@ TEST_P(WaylandDataDeviceManagerTest, ReadFromClipboard) {
   // TODO(nickdiego): implement this in terms of an actual wl_surface that
   // gets focused and compositor sends data_device data to it.
   auto* data_offer = data_device_manager_->data_device()->OnDataOffer();
-  data_offer->OnOffer(wl::kTextMimeTypeUtf8,
-                      ToClipboardData(std::string(wl::kSampleClipboardText)));
+  data_offer->OnOffer(kMimeTypeTextUtf8,
+                      ToClipboardData(std::string(kSampleClipboardText)));
   data_device_manager_->data_device()->OnSelection(data_offer);
   Sync();
 
@@ -151,9 +152,9 @@ TEST_P(WaylandDataDeviceManagerTest, ReadFromClipboard) {
       base::BindOnce([](const base::Optional<PlatformClipboard::Data>& data) {
         auto& bytes = data->get()->data();
         std::string string_data = std::string(bytes.begin(), bytes.end());
-        EXPECT_EQ(wl::kSampleClipboardText, string_data);
+        EXPECT_EQ(kSampleClipboardText, string_data);
       });
-  clipboard_client_->ReadData(wl::kTextMimeTypeUtf8, std::move(callback));
+  clipboard_client_->ReadData(kMimeTypeTextUtf8, std::move(callback));
   Sync();
 }
 
@@ -167,18 +168,18 @@ TEST_P(WaylandDataDeviceManagerTest, ReadFromClipboardWithoutOffer) {
         std::string string_data = std::string(bytes.begin(), bytes.end());
         EXPECT_EQ("", string_data);
       });
-  clipboard_client_->ReadData(wl::kTextMimeTypeUtf8, std::move(callback));
+  clipboard_client_->ReadData(kMimeTypeTextUtf8, std::move(callback));
 }
 
 TEST_P(WaylandDataDeviceManagerTest, IsSelectionOwner) {
   auto callback = base::BindOnce([]() {});
   std::vector<uint8_t> data_vector(
-      wl::kSampleClipboardText,
-      wl::kSampleClipboardText + strlen(wl::kSampleClipboardText));
+      kSampleClipboardText,
+      kSampleClipboardText + strlen(kSampleClipboardText));
   clipboard_client_->SetData(
       scoped_refptr<base::RefCountedBytes>(
           base::RefCountedBytes::TakeVector(&data_vector)),
-      {wl::kTextMimeTypeUtf8}, std::move(callback));
+      {kMimeTypeTextUtf8}, std::move(callback));
   Sync();
   ASSERT_TRUE(clipboard_client_->IsSelectionOwner());
 

ui/ozone/platform/wayland/host/wayland_data_drag_controller_unittest.cc

@@ -26,7 +26,6 @@
 #include "ui/ozone/platform/wayland/host/wayland_data_drag_controller.h"
 #include "ui/ozone/platform/wayland/host/wayland_data_source.h"
 #include "ui/ozone/platform/wayland/host/wayland_toplevel_window.h"
-#include "ui/ozone/platform/wayland/test/constants.h"
 #include "ui/ozone/platform/wayland/test/mock_surface.h"
 #include "ui/ozone/platform/wayland/test/test_data_device.h"
 #include "ui/ozone/platform/wayland/test/test_data_device_manager.h"
@@ -47,6 +46,9 @@ namespace ui {
 
 namespace {
 
+constexpr char kSampleTextForDragAndDrop[] =
+    "This is a sample text for drag-and-drop.";
+
 constexpr FilenameToURLPolicy kFilenameToURLPolicy =
     FilenameToURLPolicy::CONVERT_FILENAMES;
 
@@ -133,7 +135,7 @@ class WaylandDataDragControllerTest : public WaylandTest {
   }
 
   base::string16 sample_text_for_dnd() const {
-    static auto text = base::ASCIIToUTF16(wl::kSampleTextForDragAndDrop);
+    static auto text = base::ASCIIToUTF16(kSampleTextForDragAndDrop);
     return text;
   }
 
@@ -157,11 +159,11 @@ class WaylandDataDragControllerTest : public WaylandTest {
     auto callback = base::BindOnce(
         [](base::RunLoop* loop, std::vector<uint8_t>&& data) {
           std::string result(data.begin(), data.end());
-          EXPECT_EQ(wl::kSampleTextForDragAndDrop, result);
+          EXPECT_EQ(kSampleTextForDragAndDrop, result);
           loop->Quit();
         },
         &run_loop);
-    data_device_manager_->data_source()->ReadData(wl::kTextMimeTypeUtf8,
+    data_device_manager_->data_source()->ReadData(kMimeTypeTextUtf8,
                                                   std::move(callback));
     run_loop.Run();
 
@@ -263,7 +265,7 @@ TEST_P(WaylandDataDragControllerTest, StartDragWithText) {
   auto callback = base::BindOnce(
       [](base::RunLoop* loop, std::vector<uint8_t>&& data) {
         std::string result(data.begin(), data.end());
-        EXPECT_EQ(wl::kSampleTextForDragAndDrop, result);
+        EXPECT_EQ(kSampleTextForDragAndDrop, result);
         loop->Quit();
       },
       &run_loop);
@@ -275,9 +277,8 @@ TEST_P(WaylandDataDragControllerTest, StartDragWithText) {
 
 TEST_P(WaylandDataDragControllerTest, ReceiveDrag) {
   auto* data_offer = data_device_manager_->data_device()->OnDataOffer();
-  data_offer->OnOffer(
-      kMimeTypeText,
-      ToClipboardData(std::string(wl::kSampleTextForDragAndDrop)));
+  data_offer->OnOffer(kMimeTypeText,
+                      ToClipboardData(std::string(kSampleTextForDragAndDrop)));
 
   gfx::Point entered_point(10, 10);
   // The server sends an enter event.
@@ -300,7 +301,7 @@ TEST_P(WaylandDataDragControllerTest, ReceiveDrag) {
     std::string result;
     EXPECT_TRUE(contents);
     result.assign(contents->front_as<char>(), contents->size());
-    EXPECT_EQ(wl::kSampleTextForDragAndDrop, result);
+    EXPECT_EQ(kSampleTextForDragAndDrop, result);
   });
 
   // The client requests the data and gets callback with it.
@@ -313,9 +314,8 @@ TEST_P(WaylandDataDragControllerTest, ReceiveDrag) {
 
 TEST_P(WaylandDataDragControllerTest, DropSeveralMimeTypes) {
   auto* data_offer = data_device_manager_->data_device()->OnDataOffer();
-  data_offer->OnOffer(
-      kMimeTypeText,
-      ToClipboardData(std::string(wl::kSampleTextForDragAndDrop)));
+  data_offer->OnOffer(kMimeTypeText,
+                      ToClipboardData(std::string(kSampleTextForDragAndDrop)));
   data_offer->OnOffer(kMimeTypeMozillaURL, ToClipboardData(base::UTF8ToUTF16(
                                                "https://sample.com/\r\n"
                                                "Sample")));

ui/ozone/platform/wayland/host/wayland_window_drag_controller_unittest.cc

@@ -21,7 +21,6 @@
 #include "ui/ozone/platform/wayland/host/wayland_window.h"
 #include "ui/ozone/platform/wayland/host/wayland_window_drag_controller.h"
 #include "ui/ozone/platform/wayland/host/wayland_window_manager.h"
-#include "ui/ozone/platform/wayland/test/constants.h"
 #include "ui/ozone/platform/wayland/test/mock_pointer.h"
 #include "ui/ozone/platform/wayland/test/mock_surface.h"
 #include "ui/ozone/platform/wayland/test/test_data_device.h"

ui/ozone/platform/wayland/test/constants.h

-// Copyright 2019 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.
-
-#ifndef UI_OZONE_PLATFORM_WAYLAND_TEST_CONSTANTS_H_
-#define UI_OZONE_PLATFORM_WAYLAND_TEST_CONSTANTS_H_
-
-namespace wl {
-
-constexpr char kSampleClipboardText[] = "This is a sample text for clipboard.";
-constexpr char kSampleTextForDragAndDrop[] =
-    "This is a sample text for drag-and-drop.";
-constexpr char kTextMimeTypeUtf8[] = "text/plain;charset=utf-8";
-constexpr char kTextMimeTypeText[] = "text/plain";
-
-}  // namespace wl
-
-#endif  // UI_OZONE_PLATFORM_WAYLAND_TEST_CONSTANTS_H_

ui/ozone/platform/wayland/test/test_data_offer.cc

@@ -14,7 +14,6 @@
 #include "base/task/post_task.h"
 #include "base/task/task_traits.h"
 #include "base/task/thread_pool.h"
-#include "ui/ozone/platform/wayland/test/constants.h"
 
 namespace wl {
 

ui/ozone/platform/wayland/test/test_data_source.cc

@@ -18,7 +18,6 @@
 #include "base/task/task_traits.h"
 #include "base/task/thread_pool.h"
 #include "base/task_runner_util.h"
-#include "ui/ozone/platform/wayland/test/constants.h"
 
 namespace wl {