| Index: chrome/browser/spellchecker/spellcheck_service_browsertest.cc
|
| diff --git a/chrome/browser/spellchecker/spellcheck_service_browsertest.cc b/chrome/browser/spellchecker/spellcheck_service_browsertest.cc
|
| index 8c1cd5d3fcb3b71c3b5a09bc6258555a01a6445d..13deefa92cf75258fb5c63653c6f5f87228c98dc 100644
|
| --- a/chrome/browser/spellchecker/spellcheck_service_browsertest.cc
|
| +++ b/chrome/browser/spellchecker/spellcheck_service_browsertest.cc
|
| @@ -90,7 +90,7 @@ class SpellcheckServiceBrowserTest : public InProcessBrowserTest {
|
| void InitSpellcheck(bool enable_spellcheck,
|
| const std::string& single_dictionary,
|
| const std::string& multiple_dictionaries) {
|
| - prefs_->SetBoolean(spellcheck::prefs::kEnableContinuousSpellcheck,
|
| + prefs_->SetBoolean(spellcheck::prefs::kEnableSpellcheck,
|
| enable_spellcheck);
|
| prefs_->SetString(spellcheck::prefs::kSpellCheckDictionary,
|
| single_dictionary);
|
| @@ -107,7 +107,7 @@ class SpellcheckServiceBrowserTest : public InProcessBrowserTest {
|
|
|
| void EnableSpellcheck(bool enable_spellcheck) {
|
| ScopedPreferenceChange scope(&renderer_->sink());
|
| - prefs_->SetBoolean(spellcheck::prefs::kEnableContinuousSpellcheck,
|
| + prefs_->SetBoolean(spellcheck::prefs::kEnableSpellcheck,
|
| enable_spellcheck);
|
| }
|
|
|
| @@ -360,13 +360,13 @@ IN_PROC_BROWSER_TEST_F(SpellcheckServiceBrowserTest,
|
| base::ListValue dictionaries;
|
| dictionaries.AppendString("en-US");
|
| GetPrefs()->Set(spellcheck::prefs::kSpellCheckDictionaries, dictionaries);
|
| - GetPrefs()->SetBoolean(spellcheck::prefs::kEnableContinuousSpellcheck, false);
|
| + GetPrefs()->SetBoolean(spellcheck::prefs::kEnableSpellcheck, false);
|
|
|
| // Migrate the preferences.
|
| SpellcheckServiceFactory::GetForContext(GetContext());
|
|
|
| EXPECT_FALSE(
|
| - GetPrefs()->GetBoolean(spellcheck::prefs::kEnableContinuousSpellcheck));
|
| + GetPrefs()->GetBoolean(spellcheck::prefs::kEnableSpellcheck));
|
| EXPECT_EQ(1U, GetPrefs()
|
| ->GetList(spellcheck::prefs::kSpellCheckDictionaries)
|
| ->GetSize());
|
| @@ -379,13 +379,13 @@ IN_PROC_BROWSER_TEST_F(SpellcheckServiceBrowserTest,
|
| dictionaries.AppendString("en-US");
|
| dictionaries.AppendString("fr");
|
| GetPrefs()->Set(spellcheck::prefs::kSpellCheckDictionaries, dictionaries);
|
| - GetPrefs()->SetBoolean(spellcheck::prefs::kEnableContinuousSpellcheck, true);
|
| + GetPrefs()->SetBoolean(spellcheck::prefs::kEnableSpellcheck, true);
|
|
|
| // Should not migrate any preferences.
|
| SpellcheckServiceFactory::GetForContext(GetContext());
|
|
|
| EXPECT_TRUE(
|
| - GetPrefs()->GetBoolean(spellcheck::prefs::kEnableContinuousSpellcheck));
|
| + GetPrefs()->GetBoolean(spellcheck::prefs::kEnableSpellcheck));
|
| EXPECT_EQ(2U, GetPrefs()
|
| ->GetList(spellcheck::prefs::kSpellCheckDictionaries)
|
| ->GetSize());
|
|
|