Profiles: Move the Spelling system onto a ProfileKeyedServiceFactory.

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 <string>
 
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/json/string_escape.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/spellchecker/spellcheck_factory.h"
 #include "chrome/browser/spellchecker/spellcheck_host.h"
 #include "chrome/browser/spellchecker/spellcheck_host_metrics.h"
 #include "chrome/browser/spellchecker/spellcheck_platform_mac.h"
 #include "chrome/browser/tab_contents/render_view_context_menu.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/public/common/url_fetcher.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
@@ skipping 78 matching lines @@
           pref ? pref->GetString(prefs::kSpellCheckDictionary) : "en-US";
       Invoke(text, language, profile->GetRequestContext());
     }
   }
 
   if (!params.dictionary_suggestions.empty()) {
     proxy_->AddSeparator();
 
     // |spellcheck_host| can be null when the suggested word is
     // provided by Web SpellCheck API.
-    SpellCheckHost* spellcheck_host = profile->GetSpellCheckHost();
+    SpellCheckHost* spellcheck_host =
+        SpellCheckFactory::GetHostForProfile(profile);
     if (spellcheck_host && spellcheck_host->GetMetrics())
       spellcheck_host->GetMetrics()->RecordSuggestionStats(1);
   }
 
   // If word is misspelled, give option for "Add to dictionary" and "Ask Google
   // for suggestions". (The SpellCheckerSubMenuObserver class handles the "Ask
   // Goole for suggestions" item so this class does not have to handle it.)
   if (!params.misspelled_word.empty()) {
     if (params.dictionary_suggestions.empty()) {
       proxy_->AddMenuItem(IDC_CONTENT_CONTEXT_NO_SPELLING_SUGGESTIONS,
@@ skipping 67 matching lines @@
   DCHECK(IsCommandIdSupported(command_id));
 
   if (command_id >= IDC_SPELLCHECK_SUGGESTION_0 &&
       command_id <= IDC_SPELLCHECK_SUGGESTION_4) {
     proxy_->GetRenderViewHost()->Replace(
         suggestions_[command_id - IDC_SPELLCHECK_SUGGESTION_0]);
     // GetSpellCheckHost() can return null when the suggested word is
     // provided by Web SpellCheck API.
     Profile* profile = proxy_->GetProfile();
     if (profile) {
-      SpellCheckHost* spellcheck_host = profile->GetSpellCheckHost();
+      SpellCheckHost* spellcheck_host =
+          SpellCheckFactory::GetHostForProfile(profile);
       if (spellcheck_host && spellcheck_host->GetMetrics())
         spellcheck_host->GetMetrics()->RecordReplacedWordStats(1);
     }
     return;
   }
 
   // When we choose the suggestion sent from the Spelling service, we replace
   // the misspelled word with the suggestion and add it to our custom-word
   // dictionary so this word is not marked as misspelled any longer.
   if (command_id == IDC_CONTENT_CONTEXT_SPELLING_SUGGESTION) {
     proxy_->GetRenderViewHost()->Replace(result_);
     misspelled_word_ = result_;
   }
 
   if (command_id == IDC_CONTENT_CONTEXT_SPELLING_SUGGESTION ||
       command_id == IDC_SPELLCHECK_ADD_TO_DICTIONARY) {
-    // GetSpellCheckHost() can return null when the suggested word is
+    // GetHostForProfile() can return null when the suggested word is
     // provided by Web SpellCheck API.
     Profile* profile = proxy_->GetProfile();
-    if (profile && profile->GetSpellCheckHost())
-      profile->GetSpellCheckHost()->AddWord(UTF16ToUTF8(misspelled_word_));
+    if (profile) {
+      SpellCheckHost* host = SpellCheckFactory::GetHostForProfile(profile);
+      if (host)
+        host->AddWord(UTF16ToUTF8(misspelled_word_));
+    }
 #if defined(OS_MACOSX)
     spellcheck_mac::AddWord(misspelled_word_);
 #endif
   }
 }
 
 bool SpellingMenuObserver::Invoke(const string16& text,
                                   const std::string& locale,
                                   net::URLRequestContextGetter* context) {
   // Create the parameters needed by Spelling API. Spelling API needs three
@@ skipping 169 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);
 }