SpellCheck: the custom dictionary should be per profile.

chrome/browser/spellchecker/spellcheck_host_impl.cc

 // Copyright (c) 2011 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/spellcheck_host_impl.h"
 
 #include <set>
 
 #include "base/file_util.h"
 #include "base/logging.h"
@@ skipping 220 matching lines @@
     // We download from the ui thread because we need to know that
     // |request_context_getter_| is still valid before initiating the download.
     BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
         NewRunnableMethod(this, &SpellCheckHostImpl::DownloadDictionary));
     return;
   }
 
   request_context_getter_ = NULL;
 
   scoped_ptr<CustomWordList> custom_words(new CustomWordList());
-  if (file_ != base::kInvalidPlatformFileValue) {
-    // Load custom dictionary.
-    std::string contents;
-    file_util::ReadFileToString(custom_dictionary_file_, &contents);
-    CustomWordList list_of_words;
-    base::SplitString(contents, '\n', &list_of_words);
-    for (size_t i = 0; i < list_of_words.size(); ++i)
-      custom_words->push_back(list_of_words[i]);
-  }
+  if (file_ != base::kInvalidPlatformFileValue)
+    LoadCustomDictionary(custom_words.get());
 
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
       NewRunnableMethod(
           this,
           &SpellCheckHostImpl::InformProfileOfInitializationWithCustomWords,
           custom_words.release()));
 }
 
 void SpellCheckHostImpl::InitializeOnFileThread() {
   DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::FILE));
@@ skipping 42 matching lines @@
   }
   GURL url = GURL(std::string(kDownloadServerUrl) +
                   StringToLowerASCII(bdict_file));
   fetcher_.reset(new URLFetcher(url, URLFetcher::GET, this));
   fetcher_->set_request_context(request_context_getter_);
   tried_to_download_ = true;
   fetcher_->Start();
   request_context_getter_ = NULL;
 }
 
+void SpellCheckHostImpl::LoadCustomDictionary(CustomWordList* custom_words) {
+  if (!custom_words)
+    return;
+
+  std::string contents;

[Hironori Bono, 2011/10/20 04:48:50]

nit: move this declaration above Line 317 "file_util::ReadFileToString(...);'
<http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml?showone=Local_...>.

[shinyak (Google), 2011/10/20 12:04:52]

Done.

+  CustomWordList list_of_words;

[Hironori Bono, 2011/10/20 04:48:50]

nit: ditto.

[shinyak (Google), 2011/10/20 12:04:52]

Done.

+
+  // Load custom dictionary for profile.
+  if (profile_)
+    profile_->LoadCustomDictionary(custom_words);
+
+  // Load custom dictionary.
+  file_util::ReadFileToString(custom_dictionary_file_, &contents);
+  base::SplitString(contents, '\n', &list_of_words);

[Hironori Bono, 2011/10/20 04:48:50]

nit: need 'if (!contents.empty()) {' to avoid calling base::SplitString() for
empty strings?

[shinyak (Google), 2011/10/20 12:04:52]

Done.

+  for (size_t i = 0; i < list_of_words.size(); ++i) {
+    if (list_of_words[i] != "")
+      custom_words->push_back(list_of_words[i]);
+  }
+}
+
 void SpellCheckHostImpl::WriteWordToCustomDictionary(const std::string& word) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
-  // Stored in UTF-8.
-  std::string word_to_add(word + "\n");
-  FILE* f = file_util::OpenFile(custom_dictionary_file_, "a+");
-  if (f)
-    fputs(word_to_add.c_str(), f);
-  file_util::CloseFile(f);
+  if (profile_)
+    profile_->WriteWordToCustomDictionary(word);
 }
 
 void SpellCheckHostImpl::OnURLFetchComplete(const URLFetcher* source,
                                             const GURL& url,
                                             const net::URLRequestStatus& status,
                                             int response_code,
                                             const net::ResponseCookies& cookies,
                                             const std::string& data) {
   DCHECK(source);
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ skipping 102 matching lines @@
   return file_;
 }
 
 const std::string& SpellCheckHostImpl::GetLanguage() const {
   return language_;
 }
 
 bool SpellCheckHostImpl::IsUsingPlatformChecker() const {
   return use_platform_spellchecker_;
 }