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

Unified Diff: chrome/browser/chromeos/input_method/input_method_persistence_unittest.cc

Issue 1055863002: ChromeOS: switch UI language before apps are loaded. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove empty line. Created 5 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/input_method/input_method_persistence_unittest.cc
diff --git a/chrome/browser/chromeos/input_method/input_method_persistence_unittest.cc b/chrome/browser/chromeos/input_method/input_method_persistence_unittest.cc
index 2d071bfd962198be2e3796bd4aabd404ed601828..c91d7fc54421fe94148157fc10f1b219996edf59 100644
--- a/chrome/browser/chromeos/input_method/input_method_persistence_unittest.cc
+++ b/chrome/browser/chromeos/input_method/input_method_persistence_unittest.cc
@@ -88,32 +88,38 @@ TEST_F(InputMethodPersistenceTest, TestPrefPersistenceByState) {
persistence.OnSessionStateChange(InputMethodManager::STATE_LOGIN_SCREEN);
mock_manager_.SetCurrentInputMethodId(kInputId1);
- persistence.InputMethodChanged(&mock_manager_, false);
+ persistence.InputMethodChanged(&mock_manager_,
+ ProfileManager::GetActiveUserProfile(), false);
VerifyPrefs("", "", kInputId1);
persistence.OnSessionStateChange(InputMethodManager::STATE_BROWSER_SCREEN);
mock_manager_.SetCurrentInputMethodId(kInputId2);
- persistence.InputMethodChanged(&mock_manager_, false);
+ persistence.InputMethodChanged(&mock_manager_,
+ ProfileManager::GetActiveUserProfile(), false);
VerifyPrefs(kInputId2, "", kInputId1);
persistence.OnSessionStateChange(InputMethodManager::STATE_LOCK_SCREEN);
mock_manager_.SetCurrentInputMethodId(kInputId1);
- persistence.InputMethodChanged(&mock_manager_, false);
+ persistence.InputMethodChanged(&mock_manager_,
+ ProfileManager::GetActiveUserProfile(), false);
VerifyPrefs(kInputId2, "", kInputId1);
persistence.OnSessionStateChange(InputMethodManager::STATE_TERMINATING);
mock_manager_.SetCurrentInputMethodId(kInputId1);
- persistence.InputMethodChanged(&mock_manager_, false);
+ persistence.InputMethodChanged(&mock_manager_,
+ ProfileManager::GetActiveUserProfile(), false);
VerifyPrefs(kInputId2, "", kInputId1);
persistence.OnSessionStateChange(InputMethodManager::STATE_LOGIN_SCREEN);
mock_manager_.SetCurrentInputMethodId(kInputId2);
- persistence.InputMethodChanged(&mock_manager_, false);
+ persistence.InputMethodChanged(&mock_manager_,
+ ProfileManager::GetActiveUserProfile(), false);
VerifyPrefs(kInputId2, "", kInputId2);
persistence.OnSessionStateChange(InputMethodManager::STATE_BROWSER_SCREEN);
mock_manager_.SetCurrentInputMethodId(kInputId1);
- persistence.InputMethodChanged(&mock_manager_, false);
+ persistence.InputMethodChanged(&mock_manager_,
+ ProfileManager::GetActiveUserProfile(), false);
VerifyPrefs(kInputId1, kInputId2, kInputId2);
}

Powered by Google App Engine
This is Rietveld 408576698