| OLD | NEW |
| 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/spellchecker/spellcheck_service.h" | 5 #include "chrome/browser/spellchecker/spellcheck_service.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <tuple> | 10 #include <tuple> |
| (...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 223 // removing spellcheck languages should disable spellcheck. | 223 // removing spellcheck languages should disable spellcheck. |
| 224 IN_PROC_BROWSER_TEST_F(SpellcheckServiceBrowserTest, | 224 IN_PROC_BROWSER_TEST_F(SpellcheckServiceBrowserTest, |
| 225 StartWithBothLanguagePreferences) { | 225 StartWithBothLanguagePreferences) { |
| 226 InitSpellcheck(true, "en-US", "en-US,fr"); | 226 InitSpellcheck(true, "en-US", "en-US,fr"); |
| 227 EXPECT_TRUE(GetFirstEnableSpellcheckMessageParam()); | 227 EXPECT_TRUE(GetFirstEnableSpellcheckMessageParam()); |
| 228 | 228 |
| 229 SetMultiLingualDictionaries(""); | 229 SetMultiLingualDictionaries(""); |
| 230 EXPECT_FALSE(GetFirstEnableSpellcheckMessageParam()); | 230 EXPECT_FALSE(GetFirstEnableSpellcheckMessageParam()); |
| 231 } | 231 } |
| 232 | 232 |
| 233 // Flaky on Windows, see https://crbug.com/611029. |
| 234 #if defined(OS_WIN) |
| 235 #define MAYBE_StartWithoutLanguages DISABLED_StartWithoutLanguages |
| 236 #else |
| 237 #define MAYBE_StartWithoutLanguages StartWithoutLanguages |
| 238 #endif |
| 233 // Starting without spellcheck languages should send the 'disable spellcheck' | 239 // Starting without spellcheck languages should send the 'disable spellcheck' |
| 234 // message to the renderer. Consequently adding spellchecking languages should | 240 // message to the renderer. Consequently adding spellchecking languages should |
| 235 // enable spellcheck. | 241 // enable spellcheck. |
| 236 IN_PROC_BROWSER_TEST_F(SpellcheckServiceBrowserTest, StartWithoutLanguages) { | 242 IN_PROC_BROWSER_TEST_F(SpellcheckServiceBrowserTest, |
| 243 MAYBE_StartWithoutLanguages) { |
| 237 InitSpellcheck(true, "", ""); | 244 InitSpellcheck(true, "", ""); |
| 238 EXPECT_FALSE(GetFirstEnableSpellcheckMessageParam()); | 245 EXPECT_FALSE(GetFirstEnableSpellcheckMessageParam()); |
| 239 | 246 |
| 240 SetMultiLingualDictionaries("en-US"); | 247 SetMultiLingualDictionaries("en-US"); |
| 241 EXPECT_TRUE(GetFirstEnableSpellcheckMessageParam()); | 248 EXPECT_TRUE(GetFirstEnableSpellcheckMessageParam()); |
| 242 } | 249 } |
| 243 | 250 |
| 244 // Starting with spellcheck disabled should send the 'disable spellcheck' | 251 // Starting with spellcheck disabled should send the 'disable spellcheck' |
| 245 // message to the renderer. Consequently enabling spellcheck should send the | 252 // message to the renderer. Consequently enabling spellcheck should send the |
| 246 // 'enable spellcheck' message to the renderer. | 253 // 'enable spellcheck' message to the renderer. |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 368 EXPECT_TRUE(GetPrefs()->GetBoolean(prefs::kEnableContinuousSpellcheck)); | 375 EXPECT_TRUE(GetPrefs()->GetBoolean(prefs::kEnableContinuousSpellcheck)); |
| 369 EXPECT_EQ(2U, GetPrefs()->GetList(prefs::kSpellCheckDictionaries)->GetSize()); | 376 EXPECT_EQ(2U, GetPrefs()->GetList(prefs::kSpellCheckDictionaries)->GetSize()); |
| 370 std::string pref; | 377 std::string pref; |
| 371 ASSERT_TRUE( | 378 ASSERT_TRUE( |
| 372 GetPrefs()->GetList(prefs::kSpellCheckDictionaries)->GetString(0, &pref)); | 379 GetPrefs()->GetList(prefs::kSpellCheckDictionaries)->GetString(0, &pref)); |
| 373 EXPECT_EQ("en-US", pref); | 380 EXPECT_EQ("en-US", pref); |
| 374 ASSERT_TRUE( | 381 ASSERT_TRUE( |
| 375 GetPrefs()->GetList(prefs::kSpellCheckDictionaries)->GetString(1, &pref)); | 382 GetPrefs()->GetList(prefs::kSpellCheckDictionaries)->GetString(1, &pref)); |
| 376 EXPECT_EQ("fr", pref); | 383 EXPECT_EQ("fr", pref); |
| 377 } | 384 } |
| OLD | NEW |