Remove Hunspell on OS X - step 5

* Remove is_using_platform_spelling_engine() from spellcheck_provider.
* Move more Mac-only code in spellcheck_provider inside an ifdef.

BUG=69944
TEST=Spellchecking on Mac and Windows should continue to work.


Review URL: http://codereview.chromium.org/9025010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115568 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 3 insertions, 20 deletions

diff --git a/chrome/renderer/spellchecker/spellcheck_provider.cc b/chrome/renderer/spellchecker/spellcheck_provider.cc
index 28050c5..dc7ca11 100644
--- a/chrome/renderer/spellchecker/spellcheck_provider.cc
+++ b/chrome/renderer/spellchecker/spellcheck_provider.cc
@@ -78,6 +78,7 @@ bool SpellCheckProvider::OnMessageReceived(const IPC::Message& message) {
 }
 
 void SpellCheckProvider::FocusedNodeChanged(const WebKit::WebNode& unused) {
+#if defined(OS_MACOSX)
   bool enabled = false;
   WebKit::WebNode node = render_view()->GetFocusedNode();
   if (!node.isNull())
@@ -90,9 +91,8 @@ void SpellCheckProvider::FocusedNodeChanged(const WebKit::WebNode& unused) {
       checked = true;
   }
 
-#if defined(OS_MACOSX)
   Send(new SpellCheckHostMsg_ToggleSpellCheck(routing_id(), enabled, checked));
-#endif
+#endif  // OS_MACOSX
 }
 
 void SpellCheckProvider::spellCheck(
@@ -154,10 +154,6 @@ void SpellCheckProvider::updateSpellingUIWithMisspelledWord(
 #endif
 }
 
-bool SpellCheckProvider::is_using_platform_spelling_engine() const {
-  return spellcheck_ && spellcheck_->is_using_platform_spelling_engine();
-}
-
 void SpellCheckProvider::OnAdvanceToNextMisspelling() {
   if (!render_view()->GetWebView())
     return;
diff --git a/chrome/renderer/spellchecker/spellcheck_provider.h b/chrome/renderer/spellchecker/spellcheck_provider.h
index 62cb382..dd37059 100644
--- a/chrome/renderer/spellchecker/spellcheck_provider.h
+++ b/chrome/renderer/spellchecker/spellcheck_provider.h
@@ -38,10 +38,6 @@ class SpellCheckProvider : public content::RenderViewObserver,
       int document_tag,
       WebKit::WebTextCheckingCompletion* completion);
 
-  // Check the availability of the platform spellchecker.
-  // Makes this virtual for overriding on the unittest.
-  virtual bool is_using_platform_spelling_engine() const;
-
   // The number of ongoing IPC requests.
   size_t pending_text_request_size() const {
     return text_check_completions_.size();
diff --git a/chrome/renderer/spellchecker/spellcheck_provider_hunspell_unittest.cc b/chrome/renderer/spellchecker/spellcheck_provider_hunspell_unittest.cc
index df520bc..936420f 100644
--- a/chrome/renderer/spellchecker/spellcheck_provider_hunspell_unittest.cc
+++ b/chrome/renderer/spellchecker/spellcheck_provider_hunspell_unittest.cc
@@ -18,8 +18,7 @@
 
 namespace {
 
-// Faked test target, which stores sent message for verification,
-// and allows manipulate |is_using_platform_spelling_engine| parameter.
+// Faked test target, which stores sent message for verification.
 class TestingSpellCheckProvider : public SpellCheckProvider {
  public:
   TestingSpellCheckProvider()
@@ -35,10 +34,6 @@ class TestingSpellCheckProvider : public SpellCheckProvider {
     return true;
   }
 
-  virtual bool is_using_platform_spelling_engine() const OVERRIDE {
-    return false;
-  }
-
   std::vector<IPC::Message*> messages_;
 };
 
diff --git a/chrome/renderer/spellchecker/spellcheck_provider_mac_unittest.cc b/chrome/renderer/spellchecker/spellcheck_provider_mac_unittest.cc
index d41bf82..75c5357 100644
--- a/chrome/renderer/spellchecker/spellcheck_provider_mac_unittest.cc
+++ b/chrome/renderer/spellchecker/spellcheck_provider_mac_unittest.cc
@@ -33,10 +33,6 @@ class TestingSpellCheckProvider : public SpellCheckProvider {
     return true;
   }
 
-  virtual bool is_using_platform_spelling_engine() const OVERRIDE {
-    return true;
-  }
-
   std::vector<IPC::Message*> messages_;
 };