Remove --use-spelling-suggestions flag.

chrome/browser/renderer_context_menu/spelling_menu_observer_browsertest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/renderer_context_menu/spelling_menu_observer.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
@@ skipping 214 matching lines @@
   void InitMenu(const char* word, const char* suggestion) {
     content::ContextMenuParams params;
     params.is_editable = true;
     params.misspelled_word = base::ASCIIToUTF16(word);
     params.dictionary_suggestions.clear();
     if (suggestion)
       params.dictionary_suggestions.push_back(base::ASCIIToUTF16(suggestion));
     observer_->InitMenu(params);
   }
 
+  void ForceSuggestMode() {
+    menu()->GetPrefs()->SetBoolean(prefs::kSpellCheckUseSpellingService, true);
+    // Force a non-empty and non-"en" locale so SUGGEST is available.
+    menu()->GetPrefs()->SetString(prefs::kSpellCheckDictionary, "fr");
+    ASSERT_TRUE(SpellingServiceClient::IsAvailable(
+        menu()->GetProfile(), SpellingServiceClient::SUGGEST));
+    ASSERT_FALSE(SpellingServiceClient::IsAvailable(
+        menu()->GetProfile(), SpellingServiceClient::SPELLCHECK));
+  }
+
   virtual ~SpellingMenuObserverTest();
   MockRenderViewContextMenu* menu() { return menu_.get(); }
   SpellingMenuObserver* observer() { return observer_.get(); }
  private:
   scoped_ptr<SpellingMenuObserver> observer_;
   scoped_ptr<MockRenderViewContextMenu> menu_;
   DISALLOW_COPY_AND_ASSIGN(SpellingMenuObserverTest);
 };
 
 SpellingMenuObserverTest::SpellingMenuObserverTest() {
@@ skipping 71 matching lines @@
   menu()->GetMenuItem(2, &item);
   EXPECT_EQ(IDC_CONTENT_CONTEXT_SPELLING_TOGGLE, item.command_id);
   EXPECT_TRUE(item.enabled);
   EXPECT_TRUE(item.checked);
   EXPECT_FALSE(item.hidden);
 }
 
 // Test that there will be a separator after "no suggestions" if
 // SpellingServiceClient::SUGGEST is on.
 IN_PROC_BROWSER_TEST_F(SpellingMenuObserverTest, SeparatorAfterSuggestions) {
-  menu()->GetPrefs()->SetBoolean(prefs::kSpellCheckUseSpellingService, true);
-  CommandLine* command_line = CommandLine::ForCurrentProcess();
-  command_line->AppendSwitch(switches::kUseSpellingSuggestions);
-
-  // Force a non-empty locale so SUGGEST is available.
-  menu()->GetPrefs()->SetString(prefs::kSpellCheckDictionary, "en");
-  EXPECT_TRUE(SpellingServiceClient::IsAvailable(menu()->GetProfile(),
-    SpellingServiceClient::SUGGEST));
-
+  ForceSuggestMode();
   InitMenu("jhhj", NULL);
 
   // The test should see a top separator, "No spelling suggestions",
   // "No more Google suggestions" (from SpellingService) and a separator
   // as the first four items, then possibly more (not relevant here).
   EXPECT_LT(4U, menu()->GetMenuSize());
 
   MockRenderViewContextMenu::MockMenuItem item;
   menu()->GetMenuItem(0, &item);
   EXPECT_EQ(-1, item.command_id);
@@ skipping 115 matching lines @@
   InitMenu("asdfkj", "asdf");
 
   // Expect at least separator and 4 default entries.
   EXPECT_LT(static_cast<size_t>(5), menu()->GetMenuSize());
   // This test only cares that the first one is a separator.
   menu()->GetMenuItem(0, &item);
   EXPECT_EQ(-1, item.command_id);
 
   // Case #3. Misspelled word, suggestion service is on.
   Reset(false);
-  menu()->GetPrefs()->SetBoolean(prefs::kSpellCheckUseSpellingService, true);
-  CommandLine* command_line = CommandLine::ForCurrentProcess();
-  command_line->AppendSwitch(switches::kUseSpellingSuggestions);
+  ForceSuggestMode();
   InitMenu("asdfkj", NULL);
 
   // Should have at least 2 entries. Separator, suggestion.
   EXPECT_LT(2U, menu()->GetMenuSize());
   menu()->GetMenuItem(0, &item);
   EXPECT_EQ(-1, item.command_id);
   menu()->GetMenuItem(1, &item);
   EXPECT_EQ(IDC_CONTENT_CONTEXT_SPELLING_SUGGESTION, item.command_id);
 }