Componentize spellcheck [4]: spellcheck/browser and android java-side.

chrome/browser/extensions/api/language_settings_private/language_settings_private_delegate.cc

 // Copyright 2015 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/extensions/api/language_settings_private/language_settings_private_delegate.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/spellchecker/spellcheck_factory.h"
 #include "chrome/browser/spellchecker/spellcheck_service.h"
-#include "chrome/common/pref_names.h"
 #include "components/prefs/pref_service.h"
+#include "components/spellcheck/browser/pref_names.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/notification_source.h"
 
 namespace extensions {
 
 namespace language_settings_private = api::language_settings_private;
 
 LanguageSettingsPrivateDelegate::LanguageSettingsPrivateDelegate(
     content::BrowserContext* context)
     : custom_dictionary_(nullptr),
@@ skipping 169 matching lines @@
   bool should_listen =
       event_router->HasEventListener(language_settings_private::
           OnSpellcheckDictionariesChanged::kEventName) ||
       event_router->HasEventListener(language_settings_private::
           OnCustomDictionaryChanged::kEventName);
 
   if (should_listen && !listening_spellcheck_) {
     // Update and observe the hunspell dictionaries.
     RefreshDictionaries(listening_spellcheck_, should_listen);
     // Observe the dictionaries preference.
-    pref_change_registrar_.Add(prefs::kSpellCheckDictionaries, base::Bind(
-        &LanguageSettingsPrivateDelegate::OnSpellcheckDictionariesChanged,
-        base::Unretained(this)));
+    pref_change_registrar_.Add(
+        spellcheck::prefs::kSpellCheckDictionaries,
+        base::Bind(
+            &LanguageSettingsPrivateDelegate::OnSpellcheckDictionariesChanged,
+            base::Unretained(this)));
     // Observe the dictionary of custom words.
     if (custom_dictionary_)
       custom_dictionary_->AddObserver(this);
   } else if (!should_listen && listening_spellcheck_) {
     // Stop observing any dictionaries that still exist.
     RemoveDictionaryObservers();
     hunspell_dictionaries_.clear();
-    pref_change_registrar_.Remove(prefs::kSpellCheckDictionaries);
+    pref_change_registrar_.Remove(spellcheck::prefs::kSpellCheckDictionaries);
     if (custom_dictionary_)
       custom_dictionary_->RemoveObserver(this);
   }
 
   listening_spellcheck_ = should_listen;
 }
 
 void LanguageSettingsPrivateDelegate::OnSpellcheckDictionariesChanged() {
   RefreshDictionaries(listening_spellcheck_, listening_spellcheck_);
   BroadcastDictionariesChangedEvent();
@@ skipping 14 matching lines @@
 }
 
 void LanguageSettingsPrivateDelegate::RemoveDictionaryObservers() {
   for (const auto& dictionary : hunspell_dictionaries_) {
     if (dictionary)
       dictionary->RemoveObserver(this);
   }
 }
 
 }  // namespace extensions