Remove usages of XInternAtom

remoting/host/linux/x_server_clipboard.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 "remoting/host/linux/x_server_clipboard.h"
 
 #include <X11/extensions/Xfixes.h>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "remoting/base/constants.h"
 #include "remoting/base/logging.h"
 #include "remoting/base/util.h"
+#include "ui/base/x/x11_util.h"
 
 namespace remoting {
 
 XServerClipboard::XServerClipboard()
     : display_(nullptr),
       clipboard_window_(BadValue),
       xfixes_event_base_(-1),
       clipboard_atom_(None),
       large_selection_atom_(None),
       selection_string_atom_(None),
@@ skipping 24 matching lines @@
                             &xfixes_error_base)) {
     HOST_LOG << "X server does not support XFixes.";
     return;
   }
 
   clipboard_window_ = XCreateSimpleWindow(display_,
                                           DefaultRootWindow(display_),
                                           0, 0, 1, 1,  // x, y, width, height
                                           0, 0, 0);
 
-  // TODO(lambroslambrou): Use ui::X11AtomCache for this, either by adding a
-  // dependency on ui/ or by moving X11AtomCache to base/.
-  static const char* const kAtomNames[] = {
-    "CLIPBOARD",
-    "INCR",
-    "SELECTION_STRING",
-    "TARGETS",
-    "TIMESTAMP",
-    "UTF8_STRING"
-  };
-  static const int kNumAtomNames = arraysize(kAtomNames);
-
-  Atom atoms[kNumAtomNames];
-  if (XInternAtoms(display_, const_cast<char**>(kAtomNames), kNumAtomNames,
-                   False, atoms)) {
-    clipboard_atom_ = atoms[0];
-    large_selection_atom_ = atoms[1];
-    selection_string_atom_ = atoms[2];
-    targets_atom_ = atoms[3];
-    timestamp_atom_ = atoms[4];
-    utf8_string_atom_ = atoms[5];
-    static_assert(kNumAtomNames >= 6, "kAtomNames is too small");
-  } else {
-    LOG(ERROR) << "XInternAtoms failed";
-  }
+  clipboard_atom_ = ui::GetAtom("CLIPLBOARD");

[Sergey Ulanov, 2017/06/01 20:40:09]

This uses a different X connection, so I don't think it will work as expected.
Also note that this code runs outside of the browser. I suggest keeping it as
is.

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

Done.

+  large_selection_atom_ = ui::GetAtom("INCR");
+  selection_string_atom_ = ui::GetAtom("SELECTION_STRING");
+  targets_atom_ = ui::GetAtom("TARGETS");
+  timestamp_atom_ = ui::GetAtom("TIMESTAMP");
+  utf8_string_atom_ = ui::GetAtom("UTF8_STRING");
 
   XFixesSelectSelectionInput(display_, clipboard_window_, clipboard_atom_,

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

Same here. Looks like this |display_| is one initialized by
remoting/host/clipboard_x11.cc

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

Done.

                              XFixesSetSelectionOwnerNotifyMask);
 }
 
 void XServerClipboard::SetClipboard(const std::string& mime_type,
                                     const std::string& data) {
   DCHECK(display_);
 
   if (clipboard_window_ == BadValue)
     return;
 
@@ skipping 271 matching lines @@
   } else {
     LOG(ERROR) << "XSetSelectionOwner failed for selection " << selection;
   }
 }
 
 bool XServerClipboard::IsSelectionOwner(Atom selection) {
   return selections_owned_.find(selection) != selections_owned_.end();
 }
 
 }  // namespace remoting