Remove usages of XInternAtom

ui/base/clipboard/clipboard_test_template.h

 // 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.
 //
 // Note: This header doesn't use REGISTER_TYPED_TEST_CASE_P like most
 // type-parameterized gtests. There are lot of test cases in here that are only
 // enabled on certain platforms. However, preprocessor directives in macro
 // arguments result in undefined behavior (and don't work on MSVC). Instead,
 // 'parameterized' tests should typedef TypesToTest (which is used to
 // instantiate the tests using the TYPED_TEST_CASE macro) and then #include this
@@ skipping 419 matching lines @@
       0xa6910313, 0x8302323e,
   };
   {
     SCOPED_TRACE("second bitmap");
     TestBitmapWrite(&this->clipboard(), gfx::Size(2, 7), fake_bitmap_2);
   }
 }
 
 TYPED_TEST(ClipboardTest, DataTest) {
   const ui::Clipboard::FormatType kFormat =
-      ui::Clipboard::GetFormatType("chromium/x-test-format");
+      ui::Clipboard::GetFormatType("chromium/x-web-custom-data");

[sadrul, 2017/06/01 20:45:31]

These seem unrelated to this CL.

[Tom Anderson, 2017/06/01 21:20:42]

Reverted this now that the NOTREACHED is gone

   std::string payload("test string");
   base::Pickle write_pickle;
   write_pickle.WriteString(payload);
 
   {
     ScopedClipboardWriter clipboard_writer(CLIPBOARD_TYPE_COPY_PASTE);
     clipboard_writer.WritePickledData(write_pickle, kFormat);
   }
 
   ASSERT_TRUE(
       this->clipboard().IsFormatAvailable(kFormat, CLIPBOARD_TYPE_COPY_PASTE));
   std::string output;
   this->clipboard().ReadData(kFormat, &output);
   ASSERT_FALSE(output.empty());
 
   base::Pickle read_pickle(output.data(), static_cast<int>(output.size()));
   base::PickleIterator iter(read_pickle);
   std::string unpickled_string;
   ASSERT_TRUE(iter.ReadString(&unpickled_string));
   EXPECT_EQ(payload, unpickled_string);
 }
 
 TYPED_TEST(ClipboardTest, MultipleDataTest) {
   const ui::Clipboard::FormatType kFormat1 =
-      ui::Clipboard::GetFormatType("chromium/x-test-format1");
+      ui::Clipboard::GetFormatType("chromium/x-bookmark-entries");
   std::string payload1("test string1");
   base::Pickle write_pickle1;
   write_pickle1.WriteString(payload1);
 
   const ui::Clipboard::FormatType kFormat2 =
-      ui::Clipboard::GetFormatType("chromium/x-test-format2");
+      ui::Clipboard::GetFormatType("chromium/x-browser-actions");
   std::string payload2("test string2");
   base::Pickle write_pickle2;
   write_pickle2.WriteString(payload2);
 
   {
     ScopedClipboardWriter clipboard_writer(CLIPBOARD_TYPE_COPY_PASTE);
     clipboard_writer.WritePickledData(write_pickle1, kFormat1);
     // overwrite the previous pickle for fun
     clipboard_writer.WritePickledData(write_pickle2, kFormat2);
   }
@@ skipping 197 matching lines @@
   ScopedClipboardWriter scw(CLIPBOARD_TYPE_COPY_PASTE);
   scw.WritePickledData(base::Pickle(), Clipboard::GetPlainTextFormatType());
 }
 
 TYPED_TEST(ClipboardTest, WriteImageEmptyParams) {
   ScopedClipboardWriter scw(CLIPBOARD_TYPE_COPY_PASTE);
   scw.WriteImage(SkBitmap());
 }
 
 }  // namespace ui