Patch 3: Added files for platform-based spellcheck.

chrome/browser/spellchecker/spellcheck_message_filter_android.cc

Index: chrome/browser/spellchecker/spellcheck_message_filter_android.cc
diff --git a/chrome/browser/spellchecker/spellcheck_message_filter_mac.cc b/chrome/browser/spellchecker/spellcheck_message_filter_android.cc
similarity index 85%
copy from chrome/browser/spellchecker/spellcheck_message_filter_mac.cc
copy to chrome/browser/spellchecker/spellcheck_message_filter_android.cc
index dfc59af6e4475ce70ecb78768dd47ca38ef4c458..9084a955f9b57636e9f70f65738ba5ff6b29fd00 100644
--- a/chrome/browser/spellchecker/spellcheck_message_filter_mac.cc
+++ b/chrome/browser/spellchecker/spellcheck_message_filter_android.cc
@@ -1,8 +1,7 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright  2015 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/spellchecker/spellcheck_message_filter_mac.h"
 
 #include <algorithm>
 #include <functional>
@@ -11,7 +10,8 @@
 #include "base/bind.h"
 #include "chrome/browser/spellchecker/feedback_sender.h"
 #include "chrome/browser/spellchecker/spellcheck_factory.h"
-#include "chrome/browser/spellchecker/spellcheck_platform_mac.h"
+#include "chrome/browser/spellchecker/spellcheck_message_filter_platform.h"
+#include "chrome/browser/spellchecker/spellcheck_platform.h"
 #include "chrome/browser/spellchecker/spellcheck_service.h"
 #include "chrome/browser/spellchecker/spelling_service_client.h"
 #include "chrome/common/spellcheck_messages.h"
@@ -131,7 +131,7 @@ void SpellingRequest::RequestRemoteCheck(const base::string16& text) {
 
 void SpellingRequest::RequestLocalCheck(const base::string16& text,
                                         int document_tag) {
-  spellcheck_mac::RequestTextCheck(
+  spellcheck_platform::RequestTextCheck(
       document_tag,
       text,
       base::Bind(&SpellingRequest::OnLocalCheckCompleted,
@@ -144,7 +144,7 @@ void SpellingRequest::OnCheckCompleted() {
   if (remote_success_) {
     std::sort(remote_results_.begin(), remote_results_.end(), CompareLocation);
     std::sort(local_results_.begin(), local_results_.end(), CompareLocation);
-    SpellCheckMessageFilterMac::CombineResults(&remote_results_,
+    SpellCheckMessageFilterPlatform::CombineResults(&remote_results_,
                                                local_results_);
     check_results = &remote_results_;
   }
@@ -189,22 +189,23 @@ void SpellingRequest::OnLocalCheckCompleted(
 }
 
 
-SpellCheckMessageFilterMac::SpellCheckMessageFilterMac(int render_process_id)
+SpellCheckMessageFilterPlatform::SpellCheckMessageFilterPlatform(
+    int render_process_id)
     : BrowserMessageFilter(SpellCheckMsgStart),
       render_process_id_(render_process_id),
       client_(new SpellingServiceClient) {
 }
 
-void SpellCheckMessageFilterMac::OverrideThreadForMessage(
+void SpellCheckMessageFilterPlatform::OverrideThreadForMessage(
     const IPC::Message& message, BrowserThread::ID* thread) {
   if (message.type() == SpellCheckHostMsg_RequestTextCheck::ID)
     *thread = BrowserThread::UI;
 }
 
-bool SpellCheckMessageFilterMac::OnMessageReceived(
+bool SpellCheckMessageFilterPlatform::OnMessageReceived(
     const IPC::Message& message) {
   bool handled = true;
-  IPC_BEGIN_MESSAGE_MAP(SpellCheckMessageFilterMac, message)
+  IPC_BEGIN_MESSAGE_MAP(SpellCheckMessageFilterPlatform, message)
     IPC_MESSAGE_HANDLER(SpellCheckHostMsg_CheckSpelling,
                         OnCheckSpelling)
     IPC_MESSAGE_HANDLER(SpellCheckHostMsg_FillSuggestionList,
@@ -221,7 +222,7 @@ bool SpellCheckMessageFilterMac::OnMessageReceived(
 }
 
 // static
-void SpellCheckMessageFilterMac::CombineResults(
+void SpellCheckMessageFilterPlatform::CombineResults(
     std::vector<SpellCheckResult>* remote_results,
     const std::vector<SpellCheckResult>& local_results) {
   std::vector<SpellCheckResult>::const_iterator local_iter(
@@ -247,30 +248,31 @@ void SpellCheckMessageFilterMac::CombineResults(
   }
 }
 
-SpellCheckMessageFilterMac::~SpellCheckMessageFilterMac() {}
+SpellCheckMessageFilterPlatform::~SpellCheckMessageFilterPlatform() {}
 
-void SpellCheckMessageFilterMac::OnCheckSpelling(const base::string16& word,
+void SpellCheckMessageFilterPlatform::OnCheckSpelling(
+                                                 const base::string16& word,
                                                  int route_id,
                                                  bool* correct) {
-  *correct = spellcheck_mac::CheckSpelling(word, ToDocumentTag(route_id));
+  *correct = spellcheck_platform::CheckSpelling(word, ToDocumentTag(route_id));
 }
 
-void SpellCheckMessageFilterMac::OnFillSuggestionList(
+void SpellCheckMessageFilterPlatform::OnFillSuggestionList(
     const base::string16& word,
     std::vector<base::string16>* suggestions) {
-  spellcheck_mac::FillSuggestionList(word, suggestions);
+  spellcheck_platform::FillSuggestionList(word, suggestions);
 }
 
-void SpellCheckMessageFilterMac::OnShowSpellingPanel(bool show) {
-  spellcheck_mac::ShowSpellingPanel(show);
+void SpellCheckMessageFilterPlatform::OnShowSpellingPanel(bool show) {
+  spellcheck_platform::ShowSpellingPanel(show);
 }
 
-void SpellCheckMessageFilterMac::OnUpdateSpellingPanelWithMisspelledWord(
+void SpellCheckMessageFilterPlatform::OnUpdateSpellingPanelWithMisspelledWord(
     const base::string16& word) {
-  spellcheck_mac::UpdateSpellingPanelWithMisspelledWord(word);
+  spellcheck_platform::UpdateSpellingPanelWithMisspelledWord(word);
 }
 
-void SpellCheckMessageFilterMac::OnRequestTextCheck(
+void SpellCheckMessageFilterPlatform::OnRequestTextCheck(
     int route_id,
     int identifier,
     const base::string16& text,
@@ -298,16 +300,16 @@ void SpellCheckMessageFilterMac::OnRequestTextCheck(
       text, route_id, identifier, ToDocumentTag(route_id), markers);
 }
 
-int SpellCheckMessageFilterMac::ToDocumentTag(int route_id) {
+int SpellCheckMessageFilterPlatform::ToDocumentTag(int route_id) {
   if (!tag_map_.count(route_id))
-    tag_map_[route_id] = spellcheck_mac::GetDocumentTag();
+    tag_map_[route_id] = spellcheck_platform::GetDocumentTag();
   return tag_map_[route_id];
 }
 
 // TODO(groby): We are currently not notified of retired tags. We need
 // to track destruction of RenderViewHosts on the browser process side
 // to update our mappings when a document goes away.
-void SpellCheckMessageFilterMac::RetireDocumentTag(int route_id) {
-  spellcheck_mac::CloseDocumentWithTag(ToDocumentTag(route_id));
+void SpellCheckMessageFilterPlatform::RetireDocumentTag(int route_id) {
+  spellcheck_platform::CloseDocumentWithTag(ToDocumentTag(route_id));
   tag_map_.erase(route_id);
 }