Adding "preload_engines" and "use_global_engine" preferences to Chrome side (2nd try; see r43475 and r43481).

Modified chrome/browser/chromeos/cros/cros_in_process_browser_test.cc not to break browser_tests. Other files are not modified since the previous CL (r43475).

BUG=crosbug.com/488
TEST=none

Review URL: http://codereview.chromium.org/1599017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43603 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 9 insertions, 3 deletions

diff --git a/chrome/browser/chromeos/cros/cros_in_process_browser_test.cc b/chrome/browser/chromeos/cros/cros_in_process_browser_test.cc
index 724987b..1c910b0 100644
--- a/chrome/browser/chromeos/cros/cros_in_process_browser_test.cc
+++ b/chrome/browser/chromeos/cros/cros_in_process_browser_test.cc
@@ -101,9 +101,15 @@ void CrosInProcessBrowserTest::SetLanguageLibraryStatusAreaExpectations() {
       .Times(1)
       .RetiresOnSaturation();
   EXPECT_CALL(*mock_language_library_, GetActiveLanguages())
-      .Times(1)
+      .Times(2)
+      // Don't use WillRepeatedly since the fucntion should be evaluated twice.
+      .WillOnce(Return(CreateFallbackInputLanguageList()))
       .WillOnce(Return(CreateFallbackInputLanguageList()))
       .RetiresOnSaturation();
+  EXPECT_CALL(*mock_language_library_, SetLanguageActivated(_, _, _))
+      .Times(1)
+      .WillOnce((Return(true)))
+      .RetiresOnSaturation();
   EXPECT_CALL(*mock_language_library_, current_ime_properties())
       .Times(1)
       .WillOnce((ReturnRef(ime_properties_)))
@@ -113,8 +119,8 @@ void CrosInProcessBrowserTest::SetLanguageLibraryStatusAreaExpectations() {
       .WillOnce((ReturnRef(language_)))
       .RetiresOnSaturation();
   EXPECT_CALL(*mock_language_library_, SetImeConfig(_, _, _))
-      .Times(1)
-      .WillOnce((Return(true)))
+      .Times(2)
+      .WillRepeatedly((Return(true)))
       .RetiresOnSaturation();
   EXPECT_CALL(*mock_language_library_, RemoveObserver(_))
       .Times(1)