Patch 3.1: Refactored spellcheck_message_filter to be generic

chrome/browser/spellchecker/spellcheck_message_filter_mac.h

Index: chrome/browser/spellchecker/spellcheck_message_filter_mac.h
diff --git a/chrome/browser/spellchecker/spellcheck_message_filter_mac.h b/chrome/browser/spellchecker/spellcheck_message_filter_mac.h
deleted file mode 100644
index 18129b352d208d97bc920052024f396ab56d4732..0000000000000000000000000000000000000000
--- a/chrome/browser/spellchecker/spellcheck_message_filter_mac.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_SPELLCHECKER_SPELLCHECK_MESSAGE_FILTER_MAC_H_
-#define CHROME_BROWSER_SPELLCHECKER_SPELLCHECK_MESSAGE_FILTER_MAC_H_
-
-#include <map>
-
-#include "chrome/browser/spellchecker/spellcheck_message_filter.h"
-#include "chrome/common/spellcheck_result.h"
-#include "content/public/browser/browser_message_filter.h"
-
-// A message filter implementation that receives
-// the Mac-specific spell checker requests from SpellCheckProvider.
-class SpellCheckMessageFilterMac : public content::BrowserMessageFilter {
- public:
-  explicit SpellCheckMessageFilterMac(int render_process_id);
-
-  // BrowserMessageFilter implementation.
-  void OverrideThreadForMessage(const IPC::Message& message,
-                                content::BrowserThread::ID* thread) override;
-  bool OnMessageReceived(const IPC::Message& message) override;
-
-  // Adjusts remote_results by examining local_results. Any result that's both
-  // local and remote stays type SPELLING, all others are flagged GRAMMAR.
-  // (This is needed to force gray underline for remote-only results.)
-  static void CombineResults(
-      std::vector<SpellCheckResult>* remote_results,
-      const std::vector<SpellCheckResult>& local_results);
-
- private:
-  friend class TestingSpellCheckMessageFilter;
-  friend class SpellcheckMessageFilterMacTest;
-
-  ~SpellCheckMessageFilterMac() override;
-
-  void OnCheckSpelling(const base::string16& word, int route_id, bool* correct);
-  void OnFillSuggestionList(const base::string16& word,
-                            std::vector<base::string16>* suggestions);
-  void OnShowSpellingPanel(bool show);
-  void OnUpdateSpellingPanelWithMisspelledWord(const base::string16& word);
-  void OnRequestTextCheck(int route_id,
-                          int identifier,
-                          const base::string16& text,
-                          std::vector<SpellCheckMarker> markers);
-
-  int ToDocumentTag(int route_id);
-  void RetireDocumentTag(int route_id);
-  std::map<int,int> tag_map_;
-
-  int render_process_id_;
-
-  // A JSON-RPC client that calls the Spelling service in the background.
-  scoped_ptr<SpellingServiceClient> client_;
-
-  DISALLOW_COPY_AND_ASSIGN(SpellCheckMessageFilterMac);
-};
-
-#endif  // CHROME_BROWSER_SPELLCHECKER_SPELLCHECK_MESSAGE_FILTER_MAC_H_