Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(353)

Side by Side Diff: chrome/browser/chromeos/input_method/xkeyboard_unittest.cc

Issue 8437002: Move BrowserThread to content namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: A few updates. Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/input_method/xkeyboard.h" 5 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 10
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/message_loop.h" 13 #include "base/message_loop.h"
14 #include "chrome/browser/chromeos/input_method/input_method_util.h" 14 #include "chrome/browser/chromeos/input_method/input_method_util.h"
15 #include "content/test/test_browser_thread.h" 15 #include "content/test/test_browser_thread.h"
16 #include "testing/gtest/include/gtest/gtest.h" 16 #include "testing/gtest/include/gtest/gtest.h"
17 #include "ui/base/x/x11_util.h" 17 #include "ui/base/x/x11_util.h"
18 18
19 #include <X11/Xlib.h> 19 #include <X11/Xlib.h>
20 20
21 using content::BrowserThread;
22
21 #if defined(TOUCH_UI) 23 #if defined(TOUCH_UI)
22 // Since TOUCH_UI build only supports a few keyboard layouts, we skip the tests 24 // Since TOUCH_UI build only supports a few keyboard layouts, we skip the tests
23 // for now. 25 // for now.
24 #define TestCreateFullXkbLayoutNameKeepAlt \ 26 #define TestCreateFullXkbLayoutNameKeepAlt \
25 DISABLED_TestCreateFullXkbLayoutNameKeepAlt 27 DISABLED_TestCreateFullXkbLayoutNameKeepAlt
26 #define TestCreateFullXkbLayoutNameKeepCapsLock \ 28 #define TestCreateFullXkbLayoutNameKeepCapsLock \
27 DISABLED_TestCreateFullXkbLayoutNameKeepCapsLock 29 DISABLED_TestCreateFullXkbLayoutNameKeepCapsLock
28 #endif // TOUCH_UI 30 #endif // TOUCH_UI
29 31
30 namespace chromeos { 32 namespace chromeos {
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 EXPECT_TRUE(TestableXKeyboard::ContainsModifierKeyAsReplacement( 277 EXPECT_TRUE(TestableXKeyboard::ContainsModifierKeyAsReplacement(
276 GetMap(kCapsLockKey, kCapsLockKey, kVoidKey), kCapsLockKey)); 278 GetMap(kCapsLockKey, kCapsLockKey, kVoidKey), kCapsLockKey));
277 EXPECT_TRUE(TestableXKeyboard::ContainsModifierKeyAsReplacement( 279 EXPECT_TRUE(TestableXKeyboard::ContainsModifierKeyAsReplacement(
278 GetMap(kCapsLockKey, kCapsLockKey, kCapsLockKey), kCapsLockKey)); 280 GetMap(kCapsLockKey, kCapsLockKey, kCapsLockKey), kCapsLockKey));
279 EXPECT_TRUE(TestableXKeyboard::ContainsModifierKeyAsReplacement( 281 EXPECT_TRUE(TestableXKeyboard::ContainsModifierKeyAsReplacement(
280 GetMap(kSearchKey, kVoidKey, kVoidKey), kSearchKey)); 282 GetMap(kSearchKey, kVoidKey, kVoidKey), kSearchKey));
281 } 283 }
282 284
283 } // namespace input_method 285 } // namespace input_method
284 } // namespace chromeos 286 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/input_method/xkeyboard.cc ('k') | chrome/browser/chromeos/login/auth_attempt_state.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698