Revert 257618 "roll clang 198389:202554"

trunk/src/chromeos/ime/xkeyboard.cc

 // Copyright 2013 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 "chromeos/ime/xkeyboard.h"
 
 #include <cstdlib>
 #include <cstring>
 #include <queue>
 #include <set>
@@ skipping 135 matching lines @@
 unsigned int XKeyboardImpl::GetNumLockMask() {
   DCHECK(thread_checker_.CalledOnValidThread());
   static const unsigned int kBadMask = 0;
 
   unsigned int real_mask = kBadMask;
   XkbDescPtr xkb_desc =
       XkbGetKeyboard(GetXDisplay(), XkbAllComponentsMask, XkbUseCoreKbd);
   if (!xkb_desc)
     return kBadMask;
 
-  if (xkb_desc->dpy && xkb_desc->names /*TODO && xkb_desc->names->vmods*/) {
+  if (xkb_desc->dpy && xkb_desc->names && xkb_desc->names->vmods) {
     const std::string string_to_find(kNumLockVirtualModifierString);
     for (size_t i = 0; i < XkbNumVirtualMods; ++i) {
       const unsigned int virtual_mod_mask = 1U << i;
       char* virtual_mod_str_raw_ptr =
           XGetAtomName(xkb_desc->dpy, xkb_desc->names->vmods[i]);
       if (!virtual_mod_str_raw_ptr)
         continue;
       const std::string virtual_mod_str = virtual_mod_str_raw_ptr;
       XFree(virtual_mod_str_raw_ptr);
 
@@ skipping 203 matching lines @@
   return CheckLayoutName(layout_name);
 }
 
 // static
 XKeyboard* XKeyboard::Create() {
   return new XKeyboardImpl();
 }
 
 }  // namespace input_method
 }  // namespace chromeos