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

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

Issue 12453021: Revert 190596 "Extract input_method_whitelist.{h|cc} from c/b/ch..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 8 months 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chromeos/ime/input_method_whitelist.h" 15 #include "chrome/browser/chromeos/input_method/input_method_whitelist.h"
16 #include "chromeos/ime/mock_input_method_delegate.h" 16 #include "chromeos/ime/mock_input_method_delegate.h"
17 #include "content/public/test/test_browser_thread.h" 17 #include "content/public/test/test_browser_thread.h"
18 #include "testing/gtest/include/gtest/gtest.h" 18 #include "testing/gtest/include/gtest/gtest.h"
19 #include "ui/base/x/x11_util.h" 19 #include "ui/base/x/x11_util.h"
20 20
21 #include <X11/Xlib.h> 21 #include <X11/Xlib.h>
22 22
23 using content::BrowserThread; 23 using content::BrowserThread;
24 24
25 namespace chromeos { 25 namespace chromeos {
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 214
215 // Restore the initial state. 215 // Restore the initial state.
216 EXPECT_TRUE(XKeyboard::SetAutoRepeatRate(rate)); 216 EXPECT_TRUE(XKeyboard::SetAutoRepeatRate(rate));
217 EXPECT_TRUE(XKeyboard::GetAutoRepeatRateForTesting(&tmp)); 217 EXPECT_TRUE(XKeyboard::GetAutoRepeatRateForTesting(&tmp));
218 EXPECT_EQ(rate.initial_delay_in_ms, tmp.initial_delay_in_ms); 218 EXPECT_EQ(rate.initial_delay_in_ms, tmp.initial_delay_in_ms);
219 EXPECT_EQ(rate.repeat_interval_in_ms, tmp.repeat_interval_in_ms); 219 EXPECT_EQ(rate.repeat_interval_in_ms, tmp.repeat_interval_in_ms);
220 } 220 }
221 221
222 } // namespace input_method 222 } // namespace input_method
223 } // namespace chromeos 223 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698