Third patch in getting rid of caching MessageLoop pointers and always using C...

chrome/browser/spellchecker.h

 // Copyright (c) 2006-2009 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_H_
 #define CHROME_BROWSER_SPELLCHECKER_H_
 
 #include <queue>
 #include <string>
 #include <vector>
 
 #include "app/l10n_util.h"
 #include "base/string16.h"
 #include "base/task.h"
 #include "base/time.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/net/url_fetcher.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/spellcheck_worditerator.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_member.h"
 #include "unicode/uscript.h"
 
 class FilePath;
 class Hunspell;
 class PrefService;
 class Profile;
-class MessageLoop;
 class URLFetcher;
 class URLRequestContextGetter;
 
 namespace file_util {
 class MemoryMappedFile;
 }
 
 // The Browser's Spell Checker. It checks and suggests corrections.
 //
 // This object is not threadsafe. In normal usage (not unit tests) it lives on
@@ skipping 70 matching lines @@
   // spell check language. For example, for hi, it returns hi-IN.
   static std::string GetSpellCheckLanguageRegion(std::string input_language);
 
   // This function returns ll (language code) from ll-RR where 'RR' (region
   // code) is redundant. However, if the region code matters, it's preserved.
   // That is, it returns 'hi' and 'en-GB' for 'hi-IN' and 'en-GB' respectively.
   static std::string GetLanguageFromLanguageRegion(std::string input_language);
 
  private:
   friend class ReadDictionaryTask;
+  FRIEND_TEST(SpellCheckTest, SpellCheckStrings_EN_US);
+  FRIEND_TEST(SpellCheckTest, SpellCheckSuggestions_EN_US);
+  FRIEND_TEST(SpellCheckTest, SpellCheckText);
+  FRIEND_TEST(SpellCheckTest, DISABLED_SpellCheckAddToDictionary_EN_US);
+  FRIEND_TEST(SpellCheckTest,
+              DISABLED_SpellCheckSuggestionsAddToDictionary_EN_US);
+  FRIEND_TEST(SpellCheckTest, GetAutoCorrectionWord_EN_US);
+  FRIEND_TEST(SpellCheckTest, IgnoreWords_EN_US);
 
   // URLFetcher::Delegate implementation.  Called when we finish downloading the
   // spellcheck dictionary; saves the dictionary to disk.
   virtual void OnURLFetchComplete(const URLFetcher* source,
                                   const GURL& url,
                                   const URLRequestStatus& status,
                                   int response_code,
                                   const ResponseCookies& cookies,
                                   const std::string& data);
 
@@ skipping 70 matching lines @@
   // created on the UI thread. This checks calls to SpellCheckWord and the
   // destructor to make sure we're only ever running on the same thread.
   //
   // This will be NULL if it is not initialized yet (not initialized in the
   // constructor since that's on a different thread).
   MessageLoop* worker_loop_;
 
   // Flag indicating whether we tried to download the dictionary file.
   bool tried_to_download_dictionary_file_;
 
-  // File Thread Message Loop.
-  MessageLoop* file_loop_;
-
   // Used for requests. MAY BE NULL which means don't try to download.
   URLRequestContextGetter* request_context_getter_;
 
   // True when we're downloading or saving a dictionary.
   bool obtaining_dictionary_;
 
   // Remember state for auto spell correct.
   bool auto_spell_correct_turned_on_;
 
   // True if a platform-specific spellchecking engine is being used,
   // and False if hunspell is being used.
   bool is_using_platform_spelling_engine_;
 
   // URLFetcher to download a file in memory.
   scoped_ptr<URLFetcher> fetcher_;
 
   // While Hunspell is loading, we add any new custom words to this queue.
   // We will add them to |hunspell_| when it is done loading.
   std::queue<std::string> custom_words_;
 
   // Used for generating callbacks to spellchecker, since spellchecker is a
   // non-reference counted object.
   ScopedRunnableMethodFactory<SpellChecker> method_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SpellChecker);
 };
 
 #endif  // CHROME_BROWSER_SPELLCHECKER_H_