[Spellcheck] Cleanup. Resubmit, again

chrome/renderer/spellchecker/spellcheck.h

 // 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_RENDERER_SPELLCHECKER_SPELLCHECK_H_
 #define CHROME_RENDERER_SPELLCHECKER_SPELLCHECK_H_
 
 #include <queue>
 #include <string>
 #include <vector>
@@ skipping 19 matching lines @@
 namespace WebKit {
 class WebTextCheckingCompletion;
 struct WebTextCheckingResult;
 }
 
 // TODO(morrita): Needs reorg with SpellCheckProvider.
 // See http://crbug.com/73699.
 class SpellCheck : public content::RenderProcessObserver,
                    public base::SupportsWeakPtr<SpellCheck> {
  public:
+  enum ResultFilter {
+    DO_NOT_MODIFY = 1,  // Do not modify results.
+    USE_NATIVE_CHECKER,  // Use native checker to double-check.
+  };
+
   SpellCheck();
   virtual ~SpellCheck();
 
   void Init(base::PlatformFile file,
             const std::vector<std::string>& custom_words,
             const std::string& language);
 
   // SpellCheck a word.
   // Returns true if spelled correctly, false otherwise.
   // If the spellchecker failed to initialize, always returns true.
@@ skipping 32 matching lines @@
   void RequestTextChecking(const string16& text,
                            int offset,
                            WebKit::WebTextCheckingCompletion* completion);
 #endif
 
   // Creates a list of WebTextCheckingResult objects (used by WebKit) from a
   // list of SpellCheckResult objects (used by Chrome). This function also
   // checks misspelled words returned by the Spelling service and changes the
   // underline colors of contextually-misspelled words.
   void CreateTextCheckingResults(
+      ResultFilter filter,
       int line_offset,
       const string16& line_text,
       const std::vector<SpellCheckResult>& spellcheck_results,
       WebKit::WebVector<WebKit::WebTextCheckingResult>* textcheck_results);
 
  private:
+  friend class SpellCheckTest;
   FRIEND_TEST_ALL_PREFIXES(SpellCheckTest, GetAutoCorrectionWord_EN_US);
   FRIEND_TEST_ALL_PREFIXES(SpellCheckTest,
       RequestSpellCheckMultipleTimesWithoutInitialization);
 
   class SpellcheckRequest;
 
   // RenderProcessObserver implementation:
   virtual bool OnControlMessageReceived(const IPC::Message& message) OVERRIDE;
 
   // Message handlers.
@@ skipping 59 matching lines @@
   // hunspell. (When WebKit sends two or more requests, we cancel the previous
   // requests so we do not have to use vectors.)
 #if !defined (OS_MACOSX)
   scoped_ptr<SpellcheckRequest> pending_request_param_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(SpellCheck);
 };
 
 #endif  // CHROME_RENDERER_SPELLCHECKER_SPELLCHECK_H_