Fix browser_tests failure.

chrome/browser/chromeos/input_method/xkeyboard.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 "chrome/browser/chromeos/input_method/xkeyboard.h"
 
 #include <cstdlib>
 #include <cstring>
 #include <queue>
 #include <set>
@@ skipping 77 matching lines @@
 
   // Returns true if the XKB layout uses the right Alt key for special purposes
   // like AltGr.
   bool KeepRightAlt(const std::string& xkb_layout_name) const;
 
   // Returns true if the XKB layout uses the CapsLock key for special purposes.
   // For example, since US Colemak layout uses the key as back space,
   // KeepCapsLock("us(colemak)") would return true.
   bool KeepCapsLock(const std::string& xkb_layout_name) const;
 
+  // Returns true if the current thread is the UI thread, or the process is
+  // running on Linux.
+  bool CurrentlyOnUIThread() const;
+
   // Converts |key| to a modifier key name which is used in
   // /usr/share/X11/xkb/symbols/chromeos.
   static std::string ModifierKeyToString(ModifierKey key);
 
   // Called when execve'd setxkbmap process exits.
   static void OnSetLayoutFinish(pid_t pid, int status, XKeyboardImpl* self);
 
   const bool is_running_on_chrome_os_;
   unsigned int num_lock_mask_;
 
@@ skipping 136 matching lines @@
   return num_lock_enabled;
 }
 
 bool XKeyboardImpl::CapsLockIsEnabled() {
   bool caps_lock_enabled = false;
   GetLockedModifiers(&caps_lock_enabled, NULL /* Num Lock */);
   return caps_lock_enabled;
 }
 
 unsigned int XKeyboardImpl::GetNumLockMask() {
+  CHECK(CurrentlyOnUIThread());
   static const unsigned int kBadMask = 0;
 
   unsigned int real_mask = kBadMask;
   XkbDescPtr xkb_desc =
       XkbGetKeyboard(ui::GetXDisplay(), XkbAllComponentsMask, XkbUseCoreKbd);
   if (!xkb_desc) {
     return kBadMask;
   }
 
   if (xkb_desc->dpy && xkb_desc->names && xkb_desc->names->vmods) {
@@ skipping 12 matching lines @@
         break;
       }
     }
   }
   XkbFreeKeyboard(xkb_desc, 0, True /* free all components */);
   return real_mask;
 }
 
 void XKeyboardImpl::GetLockedModifiers(bool* out_caps_lock_enabled,
                                        bool* out_num_lock_enabled) {
-  // For now, don't call CHECK() here to make
-  // TabRestoreServiceTest.DontRestorePrintPreviewTab test happy.
-  // TODO(yusukes): Fix the test, then fix the if(!BrowserThread...) line below.
-  // CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  CHECK(CurrentlyOnUIThread());
 
-  if (!BrowserThread::CurrentlyOn(BrowserThread::UI) ||
-      (out_num_lock_enabled && !num_lock_mask_)) {
+  if (out_num_lock_enabled && !num_lock_mask_) {
     VLOG(1) << "Cannot get locked modifiers. Num Lock mask unknown.";
     if (out_caps_lock_enabled) {
       *out_caps_lock_enabled = false;
     }
     if (out_num_lock_enabled) {
       *out_num_lock_enabled = false;
     }
     return;
   }
 
@@ skipping 80 matching lines @@
       (full_xkb_layout_name.substr(0, 3) != "us(")) {
     full_xkb_layout_name += ",us";
   }
 #endif
 
   return full_xkb_layout_name;
 }
 
 void XKeyboardImpl::SetLockedModifiers(ModifierLockStatus new_caps_lock_status,
                                        ModifierLockStatus new_num_lock_status) {
-  CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  CHECK(CurrentlyOnUIThread());
   if (!num_lock_mask_) {
     LOG(ERROR) << "Cannot set locked modifiers. Num Lock mask unknown.";
     return;
   }
 
   unsigned int affect_mask = 0;
   unsigned int value_mask = 0;
   if (new_caps_lock_status != kDontChange) {
     affect_mask |= LockMask;
     value_mask |= ((new_caps_lock_status == kEnableLock) ? LockMask : 0);
@@ skipping 55 matching lines @@
 }
 
 bool XKeyboardImpl::KeepRightAlt(const std::string& xkb_layout_name) const {
   return keep_right_alt_xkb_layout_names_.count(xkb_layout_name) > 0;
 }
 
 bool XKeyboardImpl::KeepCapsLock(const std::string& xkb_layout_name) const {
   return caps_lock_remapped_xkb_layout_names_.count(xkb_layout_name) > 0;
 }
 
+bool XKeyboardImpl::CurrentlyOnUIThread() const {
+  // It seems that the tot Chrome (as of Mar 7 2012) does not allow browser
+  // tests to call BrowserThread::CurrentlyOn(). It ends up a CHECK failure:
+  //   FATAL:sequenced_worker_pool.cc
+  //   Check failed: constructor_message_loop_.get().
+  // For now, just allow unit/browser tests to call any functions in this class.
+  // TODO(yusukes): Stop special-casing browser_tests and remove this function.
+  if (!is_running_on_chrome_os_) {
+    return true;
+  }
+  return BrowserThread::CurrentlyOn(BrowserThread::UI);
+}
+
 // static
 std::string XKeyboardImpl::ModifierKeyToString(ModifierKey key) {
   switch (key) {
     case kSearchKey:
       return "search";
     case kLeftControlKey:
       return "leftcontrol";
     case kLeftAltKey:
       return "leftalt";
     case kVoidKey:
@@ skipping 76 matching lines @@
   return false;
 }
 
 // static
 XKeyboard* XKeyboard::Create(const InputMethodUtil& util) {
   return new XKeyboardImpl(util);
 }
 
 }  // namespace input_method
 }  // namespace chromeos