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

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

Issue 824683002: UserManager stack refactoring. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Test fixed. Created 5 years, 10 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
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/input_method_persistence.h" 5 #include "chrome/browser/chromeos/input_method/input_method_persistence.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/prefs/pref_service.h" 8 #include "base/prefs/pref_service.h"
9 #include "chrome/browser/chromeos/input_method/mock_input_method_manager.h" 9 #include "chrome/browser/chromeos/input_method/mock_input_method_manager.h"
10 #include "chrome/browser/chromeos/language_preferences.h" 10 #include "chrome/browser/chromeos/language_preferences.h"
11 #include "chrome/browser/chromeos/login/users/fake_user_manager.h" 11 #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
12 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h" 12 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
13 #include "chrome/browser/chromeos/profiles/profile_helper.h" 13 #include "chrome/browser/chromeos/profiles/profile_helper.h"
14 #include "chrome/browser/profiles/profile_manager.h" 14 #include "chrome/browser/profiles/profile_manager.h"
15 #include "chrome/common/chrome_constants.h" 15 #include "chrome/common/chrome_constants.h"
16 #include "chrome/common/chrome_switches.h" 16 #include "chrome/common/chrome_switches.h"
17 #include "chrome/common/pref_names.h" 17 #include "chrome/common/pref_names.h"
18 #include "chrome/test/base/testing_browser_process.h" 18 #include "chrome/test/base/testing_browser_process.h"
19 #include "chrome/test/base/testing_pref_service_syncable.h" 19 #include "chrome/test/base/testing_pref_service_syncable.h"
20 #include "chrome/test/base/testing_profile.h" 20 #include "chrome/test/base/testing_profile.h"
21 #include "chrome/test/base/testing_profile_manager.h" 21 #include "chrome/test/base/testing_profile_manager.h"
22 #include "chromeos/chromeos_switches.h" 22 #include "chromeos/chromeos_switches.h"
23 23
24 #include "testing/gtest/include/gtest/gtest.h" 24 #include "testing/gtest/include/gtest/gtest.h"
25 25
26 namespace chromeos { 26 namespace chromeos {
27 namespace input_method { 27 namespace input_method {
28 28
29 namespace { 29 namespace {
30 const char kInputId1[] = "xkb:us:dvorak:eng"; 30 const char kInputId1[] = "xkb:us:dvorak:eng";
31 const char kInputId2[] = "xkb:us:colemak:eng"; 31 const char kInputId2[] = "xkb:us:colemak:eng";
32 } 32 }
33 33
34 class InputMethodPersistenceTest : public testing::Test { 34 class InputMethodPersistenceTest : public testing::Test {
35 protected: 35 protected:
36 InputMethodPersistenceTest() 36 InputMethodPersistenceTest()
37 : mock_profile_manager_(TestingBrowserProcess::GetGlobal()), 37 : mock_profile_manager_(TestingBrowserProcess::GetGlobal()),
38 fake_user_manager_(new chromeos::FakeUserManager()), 38 fake_user_manager_(new chromeos::FakeChromeUserManager()),
39 user_manager_enabler_(fake_user_manager_) {} 39 user_manager_enabler_(fake_user_manager_) {}
40 40
41 void SetUp() override { 41 void SetUp() override {
42 ASSERT_TRUE(mock_profile_manager_.SetUp()); 42 ASSERT_TRUE(mock_profile_manager_.SetUp());
43 43
44 // Add a user. 44 // Add a user.
45 const char kTestUserName[] = "test-user@example.com"; 45 const char kTestUserName[] = "test-user@example.com";
46 fake_user_manager_->AddUser(kTestUserName); 46 fake_user_manager_->AddUser(kTestUserName);
47 fake_user_manager_->LoginUser(kTestUserName); 47 fake_user_manager_->LoginUser(kTestUserName);
48 48
(...skipping 15 matching lines...) Expand all
64 EXPECT_EQ(previous_input_method, 64 EXPECT_EQ(previous_input_method,
65 mock_user_prefs_->GetString(prefs::kLanguagePreviousInputMethod)); 65 mock_user_prefs_->GetString(prefs::kLanguagePreviousInputMethod));
66 EXPECT_EQ(preferred_keyboard_layout, 66 EXPECT_EQ(preferred_keyboard_layout,
67 g_browser_process->local_state()->GetString( 67 g_browser_process->local_state()->GetString(
68 language_prefs::kPreferredKeyboardLayout)); 68 language_prefs::kPreferredKeyboardLayout));
69 } 69 }
70 70
71 TestingPrefServiceSyncable* mock_user_prefs_; 71 TestingPrefServiceSyncable* mock_user_prefs_;
72 MockInputMethodManager mock_manager_; 72 MockInputMethodManager mock_manager_;
73 TestingProfileManager mock_profile_manager_; 73 TestingProfileManager mock_profile_manager_;
74 chromeos::FakeUserManager* fake_user_manager_; 74 chromeos::FakeChromeUserManager* fake_user_manager_;
75 chromeos::ScopedUserManagerEnabler user_manager_enabler_; 75 chromeos::ScopedUserManagerEnabler user_manager_enabler_;
76 }; 76 };
77 77
78 TEST_F(InputMethodPersistenceTest, TestLifetime) { 78 TEST_F(InputMethodPersistenceTest, TestLifetime) {
79 { 79 {
80 InputMethodPersistence persistence(&mock_manager_); 80 InputMethodPersistence persistence(&mock_manager_);
81 EXPECT_EQ(1, mock_manager_.add_observer_count_); 81 EXPECT_EQ(1, mock_manager_.add_observer_count_);
82 } 82 }
83 EXPECT_EQ(1, mock_manager_.remove_observer_count_); 83 EXPECT_EQ(1, mock_manager_.remove_observer_count_);
84 } 84 }
(...skipping 27 matching lines...) Expand all
112 VerifyPrefs(kInputId2, "", kInputId2); 112 VerifyPrefs(kInputId2, "", kInputId2);
113 113
114 persistence.OnSessionStateChange(InputMethodManager::STATE_BROWSER_SCREEN); 114 persistence.OnSessionStateChange(InputMethodManager::STATE_BROWSER_SCREEN);
115 mock_manager_.SetCurrentInputMethodId(kInputId1); 115 mock_manager_.SetCurrentInputMethodId(kInputId1);
116 persistence.InputMethodChanged(&mock_manager_, false); 116 persistence.InputMethodChanged(&mock_manager_, false);
117 VerifyPrefs(kInputId1, kInputId2, kInputId2); 117 VerifyPrefs(kInputId1, kInputId2, kInputId2);
118 } 118 }
119 119
120 } // namespace input_method 120 } // namespace input_method
121 } // namespace chromeos 121 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698