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

chrome/browser/renderer_context_menu/spelling_menu_observer.cc

Index: chrome/browser/renderer_context_menu/spelling_menu_observer.cc
diff --git a/chrome/browser/renderer_context_menu/spelling_menu_observer.cc b/chrome/browser/renderer_context_menu/spelling_menu_observer.cc
index d45eb2319b79a83cf77ca43fb345f15d98005843..88738e6f67987863c6da00a8896b3417906e5f44 100644
--- a/chrome/browser/renderer_context_menu/spelling_menu_observer.cc
+++ b/chrome/browser/renderer_context_menu/spelling_menu_observer.cc
@@ -14,17 +14,18 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_context_menu/render_view_context_menu.h"
 #include "chrome/browser/renderer_context_menu/spelling_bubble_model.h"
-#include "chrome/browser/spellchecker/feedback_sender.h"
 #include "chrome/browser/spellchecker/spellcheck_factory.h"
-#include "chrome/browser/spellchecker/spellcheck_host_metrics.h"
-#include "chrome/browser/spellchecker/spellcheck_platform.h"
 #include "chrome/browser/spellchecker/spellcheck_service.h"
-#include "chrome/browser/spellchecker/spelling_service_client.h"
 #include "chrome/browser/ui/confirm_bubble.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/prefs/pref_service.h"
+#include "components/spellcheck/browser/feedback_sender.h"
+#include "components/spellcheck/browser/pref_names.h"
+#include "components/spellcheck/browser/spellcheck_host_metrics.h"
+#include "components/spellcheck/browser/spellcheck_platform.h"
+#include "components/spellcheck/browser/spelling_service_client.h"
 #include "components/spellcheck/common/spellcheck_common.h"
 #include "components/spellcheck/common/spellcheck_result.h"
 #include "content/public/browser/render_view_host.h"
@@ -48,8 +49,8 @@ SpellingMenuObserver::SpellingMenuObserver(RenderViewContextMenuProxy* proxy)
       client_(new SpellingServiceClient) {
   if (proxy_ && proxy_->GetBrowserContext()) {
     Profile* profile = Profile::FromBrowserContext(proxy_->GetBrowserContext());
-    integrate_spelling_service_.Init(prefs::kSpellCheckUseSpellingService,
-                                     profile->GetPrefs());
+    integrate_spelling_service_.Init(
+        spellcheck::prefs::kSpellCheckUseSpellingService, profile->GetPrefs());
   }
 }
 
@@ -294,8 +295,8 @@ void SpellingMenuObserver::ExecuteCommand(int command_id) {
           gfx::Point(rect.CenterPoint().x(), rect.y()), std::move(model));
     } else {
       if (profile) {
-        profile->GetPrefs()->SetBoolean(prefs::kSpellCheckUseSpellingService,
-                                        false);
+        profile->GetPrefs()->SetBoolean(
+            spellcheck::prefs::kSpellCheckUseSpellingService, false);
       }
     }
   }