Add SpellingServiceClient::IsAvailable().

chrome/browser/tab_contents/spelling_menu_observer.cc

 // Copyright (c) 2012 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/tab_contents/spelling_menu_observer.h"
 
 #include "base/bind.h"
 #include "base/i18n/case_conversion.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
@@ skipping 41 matching lines @@
   // Append Dictionary spell check suggestions.
   suggestions_ = params.dictionary_suggestions;
   for (size_t i = 0; i < params.dictionary_suggestions.size() &&
        IDC_SPELLCHECK_SUGGESTION_0 + i <= IDC_SPELLCHECK_SUGGESTION_LAST;
        ++i) {
     proxy_->AddMenuItem(IDC_SPELLCHECK_SUGGESTION_0 + static_cast<int>(i),
                         params.dictionary_suggestions[i]);
   }
 
   // Append a placeholder item for the suggestion from the Spelling serivce and
-  // send a request to the service if we have enabled the spellchecking and
-  // integrated the Spelling service.
-  PrefService* pref = profile->GetPrefs();
-  if (params.spellcheck_enabled &&
-      pref->GetBoolean(prefs::kEnableSpellCheck) &&
-      pref->GetBoolean(prefs::kSpellCheckUseSpellingService)) {
+  // send a request to the service if we can retrieve suggestions from it.
+  if (SpellingServiceClient::IsAvailable(profile,
+                                         SpellingServiceClient::SUGGEST)) {
     // Retrieve the misspelled word to be sent to the Spelling service.
     string16 text = params.misspelled_word;
     if (!text.empty()) {
       // Initialize variables used in OnURLFetchComplete(). We copy the input
       // text to the result text so we can replace its misspelled regions with
       // suggestions.
       loading_frame_ = 0;
       succeeded_ = false;
       result_ = text;
 
@@ skipping 212 matching lines @@
   loading_frame_ = (loading_frame_ + 1) & 3;
   string16 loading_message = loading_message_;
   for (int i = 0; i < loading_frame_; ++i)
     loading_message.push_back('.');
 
   // Update the menu item with the text. We disable this item to prevent users
   // from selecting it.
   proxy_->UpdateMenuItem(IDC_CONTENT_CONTEXT_SPELLING_SUGGESTION, false, false,
                          loading_message);
 }