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 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
229 // removing spellcheck languages should disable spellcheck. | 229 // removing spellcheck languages should disable spellcheck. |
230 IN_PROC_BROWSER_TEST_F(SpellcheckServiceBrowserTest, | 230 IN_PROC_BROWSER_TEST_F(SpellcheckServiceBrowserTest, |
231 StartWithBothLanguagePreferences) { | 231 StartWithBothLanguagePreferences) { |
232 InitSpellcheck(true, "en-US", "en-US,fr"); | 232 InitSpellcheck(true, "en-US", "en-US,fr"); |
233 EXPECT_TRUE(GetFirstEnableSpellcheckMessageParam()); | 233 EXPECT_TRUE(GetFirstEnableSpellcheckMessageParam()); |
234 | 234 |
235 SetMultiLingualDictionaries(""); | 235 SetMultiLingualDictionaries(""); |
236 EXPECT_FALSE(GetFirstEnableSpellcheckMessageParam()); | 236 EXPECT_FALSE(GetFirstEnableSpellcheckMessageParam()); |
237 } | 237 } |
238 | 238 |
239 // Flaky on Windows, see https://crbug.com/611029. | |
240 #if defined(OS_WIN) | |
241 #define MAYBE_StartWithoutLanguages DISABLED_StartWithoutLanguages | |
242 #else | |
243 #define MAYBE_StartWithoutLanguages StartWithoutLanguages | |
244 #endif | |
245 // Starting without spellcheck languages should send the 'disable spellcheck' | 239 // Starting without spellcheck languages should send the 'disable spellcheck' |
246 // message to the renderer. Consequently adding spellchecking languages should | 240 // message to the renderer. Consequently adding spellchecking languages should |
247 // enable spellcheck. | 241 // enable spellcheck. |
| 242 // Flaky, see https://crbug.com/600153 |
248 IN_PROC_BROWSER_TEST_F(SpellcheckServiceBrowserTest, | 243 IN_PROC_BROWSER_TEST_F(SpellcheckServiceBrowserTest, |
249 MAYBE_StartWithoutLanguages) { | 244 DISABLED_StartWithoutLanguages) { |
250 InitSpellcheck(true, "", ""); | 245 InitSpellcheck(true, "", ""); |
251 EXPECT_FALSE(GetFirstEnableSpellcheckMessageParam()); | 246 EXPECT_FALSE(GetFirstEnableSpellcheckMessageParam()); |
252 | 247 |
253 SetMultiLingualDictionaries("en-US"); | 248 SetMultiLingualDictionaries("en-US"); |
254 EXPECT_TRUE(GetFirstEnableSpellcheckMessageParam()); | 249 EXPECT_TRUE(GetFirstEnableSpellcheckMessageParam()); |
255 } | 250 } |
256 | 251 |
257 // Starting with spellcheck disabled should send the 'disable spellcheck' | 252 // Starting with spellcheck disabled should send the 'disable spellcheck' |
258 // message to the renderer. Consequently enabling spellcheck should send the | 253 // message to the renderer. Consequently enabling spellcheck should send the |
259 // 'enable spellcheck' message to the renderer. | 254 // 'enable spellcheck' message to the renderer. |
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
393 std::string pref; | 388 std::string pref; |
394 ASSERT_TRUE(GetPrefs() | 389 ASSERT_TRUE(GetPrefs() |
395 ->GetList(spellcheck::prefs::kSpellCheckDictionaries) | 390 ->GetList(spellcheck::prefs::kSpellCheckDictionaries) |
396 ->GetString(0, &pref)); | 391 ->GetString(0, &pref)); |
397 EXPECT_EQ("en-US", pref); | 392 EXPECT_EQ("en-US", pref); |
398 ASSERT_TRUE(GetPrefs() | 393 ASSERT_TRUE(GetPrefs() |
399 ->GetList(spellcheck::prefs::kSpellCheckDictionaries) | 394 ->GetList(spellcheck::prefs::kSpellCheckDictionaries) |
400 ->GetString(1, &pref)); | 395 ->GetString(1, &pref)); |
401 EXPECT_EQ("fr", pref); | 396 EXPECT_EQ("fr", pref); |
402 } | 397 } |
OLD | NEW |