Use ChromeThread::DeleteOnIOThread in a few places where an object must be de...

chrome/browser/spellchecker.cc

 // 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.
 
 #include "chrome/browser/spellchecker.h"
 
 #include "app/l10n_util.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/histogram.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/stats_counters.h"
 #include "base/string_util.h"
-#include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/net/url_fetcher.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/spellchecker_common.h"
 #include "chrome/browser/spellchecker_platform_engine.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_counters.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "grit/generated_resources.h"
@@ skipping 187 matching lines @@
     }
 
     Finish(true);
   }
 
  private:
   void Finish(bool file_existed) {
     ChromeThread::PostTask(
         ChromeThread::IO, FROM_HERE,
         NewRunnableMethod(
-            spellchecker_, &SpellChecker::HunspellInited, hunspell_,
+            spellchecker_.get(), &SpellChecker::HunspellInited, hunspell_,
             bdict_file_, file_existed));
   }
 
-  // The SpellChecker we are working for. We are guaranteed to be outlived
-  // by this object because it AddRefs() itself before calling us.
-  // Accessing it is not necessarily thread safe, but are careful to only access
-  // it in ways that are.
-  SpellChecker* spellchecker_;
+  // The SpellChecker we are working for.
+  scoped_refptr<SpellChecker> spellchecker_;
   Hunspell* hunspell_;
   file_util::MemoryMappedFile* bdict_file_;
 
   FilePath custom_dictionary_file_name_;
   FilePath dict_file_name_app_;
   FilePath dict_file_name_usr_;
 
   DISALLOW_COPY_AND_ASSIGN(ReadDictionaryTask);
 };
 
@@ skipping 287 matching lines @@
   // File name for downloading in DIR_APP_DICTIONARIES.
   FilePath dictionary_file_name_app = GetVersionedFileName(language_,
       given_dictionary_directory_);
 
   // Filename for downloading in the fallback dictionary download directory,
   // DIR_USER_DATA.
   FilePath dict_dir_userdata = GetFallbackDictionaryDownloadDirectory();
   FilePath dictionary_file_name_usr = GetVersionedFileName(language_,
       dict_dir_userdata);
 
-  // Balances Release() in HunspellInited().
-  AddRef();
   ChromeThread::PostTask(
       ChromeThread::FILE, FROM_HERE,
       new ReadDictionaryTask(
           this, dictionary_file_name_app, dictionary_file_name_usr));
 
   return hunspell_.get() != NULL;
 }
 
 void SpellChecker::HunspellInited(Hunspell* hunspell,
                                   file_util::MemoryMappedFile* bdict_file,
                                   bool file_existed) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
 
   if (file_existed)
     tried_to_init_ = true;
 
   if (!hunspell) {
     if (!file_existed) {
       // File didn't exist. We need to download a dictionary.
       DoDictionaryDownload();
     }
-
-    // Balances AddRef() in Initialize().
-    Release();
     return;
   }
 
 
   bdict_file_.reset(bdict_file);
   hunspell_.reset(hunspell);
   // Add all the custom words we've gotten while Hunspell was loading.
   while (!custom_words_.empty()) {
     hunspell_->add(custom_words_.front().c_str());
     custom_words_.pop();
   }
-
-  // Balances AddRef() in Initialize().
-  Release();
 }
 
 void SpellChecker::DoDictionaryDownload() {
   // Download the dictionary file.
   if (request_context_getter_) {
     if (!tried_to_download_dictionary_file_) {
       FilePath dictionary_file_name_app = GetVersionedFileName(language_,
           given_dictionary_directory_);
       StartDictionaryDownload(dictionary_file_name_app);
       tried_to_download_dictionary_file_ = true;
@@ skipping 226 matching lines @@
 
   // Populate the vector of WideStrings.
   for (int i = 0; i < number_of_suggestions; i++) {
     if (i < kMaxSuggestions)
       optional_suggestions->push_back(UTF8ToUTF16(suggestions[i]));
     free(suggestions[i]);
   }
   if (suggestions != NULL)
     free(suggestions);
 }