Patch 3.1: Refactored spellcheck_message_filter to be generic

chrome/browser/spellchecker/spellcheck_message_filter_platform_mac.cc

Index: chrome/browser/spellchecker/spellcheck_message_filter_platform_mac.cc
diff --git a/chrome/browser/spellchecker/spellcheck_message_filter_mac.cc b/chrome/browser/spellchecker/spellcheck_message_filter_platform_mac.cc
similarity index 90%
rename from chrome/browser/spellchecker/spellcheck_message_filter_mac.cc
rename to chrome/browser/spellchecker/spellcheck_message_filter_platform_mac.cc
index dfc59af6e4475ce70ecb78768dd47ca38ef4c458..86460ab2878ec4c2de246b45b484362d7a5b201d 100644
--- a/chrome/browser/spellchecker/spellcheck_message_filter_mac.cc
+++ b/chrome/browser/spellchecker/spellcheck_message_filter_platform_mac.cc
@@ -2,7 +2,7 @@
 // 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 "chrome/browser/spellchecker/spellcheck_message_filter_platform.h"
 
 #include <algorithm>
 #include <functional>
@@ -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_);

[please use gerrit instead, 2015/07/10 00:20:55]

Please align &remote_results_ and local_results_ to start at the same column.
You can do this in a more automated way if your editor has support for
clang-format utility.

Don't clang-format the whole file, though. This will cause many whitespace
changes that slow down the code review process.

Some people have had success using the command "git cl format". I don't use it
personally, because it tends to reformat more than what I've changed.

See https://code.google.com/p/chromium/wiki/ClangFormat

[dylanking, 2015/07/10 02:21:23]

Done, thanks for the info.

     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,
-                                                 int route_id,
-                                                 bool* correct) {
+void SpellCheckMessageFilterPlatform::OnCheckSpelling(
+    const base::string16& word,
+    int route_id,
+    bool* correct) {
   *correct = spellcheck_mac::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);
 }
 
-void SpellCheckMessageFilterMac::OnShowSpellingPanel(bool show) {
+void SpellCheckMessageFilterPlatform::OnShowSpellingPanel(bool show) {
   spellcheck_mac::ShowSpellingPanel(show);
 }
 
-void SpellCheckMessageFilterMac::OnUpdateSpellingPanelWithMisspelledWord(
+void SpellCheckMessageFilterPlatform::OnUpdateSpellingPanelWithMisspelledWord(
     const base::string16& word) {
   spellcheck_mac::UpdateSpellingPanelWithMisspelledWord(word);
 }
 
-void SpellCheckMessageFilterMac::OnRequestTextCheck(
+void SpellCheckMessageFilterPlatform::OnRequestTextCheck(
     int route_id,
     int identifier,
     const base::string16& text,
@@ -298,7 +300,7 @@ 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();
   return tag_map_[route_id];
@@ -307,7 +309,7 @@ int SpellCheckMessageFilterMac::ToDocumentTag(int 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) {
+void SpellCheckMessageFilterPlatform::RetireDocumentTag(int route_id) {
   spellcheck_mac::CloseDocumentWithTag(ToDocumentTag(route_id));
   tag_map_.erase(route_id);
 }