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

chrome/browser/spellchecker/spelling_service_client_unittest.cc

Index: chrome/browser/spellchecker/spelling_service_client_unittest.cc
diff --git a/chrome/browser/spellchecker/spelling_service_client_unittest.cc b/chrome/browser/spellchecker/spelling_service_client_unittest.cc
index 54d00772c4df3c27f9110ebb74d17f19525d8631..00384c205456e7cfe0e8cb4aedf1f37bbac4f649 100644
--- a/chrome/browser/spellchecker/spelling_service_client_unittest.cc
+++ b/chrome/browser/spellchecker/spelling_service_client_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/spellchecker/spelling_service_client.h"
+#include "components/spellcheck/browser/spelling_service_client.h"
 
 #include <stddef.h>
 
@@ -16,9 +16,9 @@
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
-#include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/prefs/pref_service.h"
+#include "components/spellcheck/browser/pref_names.h"
 #include "components/spellcheck/common/spellcheck_result.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "net/base/load_flags.h"
@@ -331,8 +331,8 @@ TEST_F(SpellingServiceClientTest, RequestTextCheck) {
   };
 
   PrefService* pref = profile_.GetPrefs();
-  pref->SetBoolean(prefs::kEnableContinuousSpellcheck, true);
-  pref->SetBoolean(prefs::kSpellCheckUseSpellingService, true);
+  pref->SetBoolean(spellcheck::prefs::kEnableContinuousSpellcheck, true);
+  pref->SetBoolean(spellcheck::prefs::kSpellCheckUseSpellingService, true);
 
   for (size_t i = 0; i < arraysize(kTests); ++i) {
     client_.SetHTTPRequest(kTests[i].request_type,
@@ -343,7 +343,7 @@ TEST_F(SpellingServiceClientTest, RequestTextCheck) {
                                        kTests[i].corrected_text);
     base::ListValue dictionary;
     dictionary.AppendString(kTests[i].language);
-    pref->Set(prefs::kSpellCheckDictionaries, dictionary);
+    pref->Set(spellcheck::prefs::kSpellCheckDictionaries, dictionary);
 
     client_.RequestTextCheck(
         &profile_,
@@ -366,20 +366,20 @@ TEST_F(SpellingServiceClientTest, AvailableServices) {
   // When a user disables spellchecking or prevent using the Spelling service,
   // this function should return false both for suggestions and for spellcheck.
   PrefService* pref = profile_.GetPrefs();
-  pref->SetBoolean(prefs::kEnableContinuousSpellcheck, false);
-  pref->SetBoolean(prefs::kSpellCheckUseSpellingService, false);
+  pref->SetBoolean(spellcheck::prefs::kEnableContinuousSpellcheck, false);
+  pref->SetBoolean(spellcheck::prefs::kSpellCheckUseSpellingService, false);
   EXPECT_FALSE(client_.IsAvailable(&profile_, kSuggest));
   EXPECT_FALSE(client_.IsAvailable(&profile_, kSpellcheck));
 
-  pref->SetBoolean(prefs::kEnableContinuousSpellcheck, true);
-  pref->SetBoolean(prefs::kSpellCheckUseSpellingService, true);
+  pref->SetBoolean(spellcheck::prefs::kEnableContinuousSpellcheck, true);
+  pref->SetBoolean(spellcheck::prefs::kSpellCheckUseSpellingService, true);
 
   // For locales supported by the SpellCheck service, this function returns
   // false for suggestions and true for spellcheck. (The comment in
   // SpellingServiceClient::IsAvailable() describes why this function returns
   // false for suggestions.) If there is no language set, then we
   // do not allow any remote.
-  pref->Set(prefs::kSpellCheckDictionaries, base::ListValue());
+  pref->Set(spellcheck::prefs::kSpellCheckDictionaries, base::ListValue());
 
   EXPECT_FALSE(client_.IsAvailable(&profile_, kSuggest));
   EXPECT_FALSE(client_.IsAvailable(&profile_, kSpellcheck));
@@ -392,7 +392,7 @@ TEST_F(SpellingServiceClientTest, AvailableServices) {
   for (size_t i = 0; i < arraysize(kSupported); ++i) {
     base::ListValue dictionary;
     dictionary.AppendString(kSupported[i]);
-    pref->Set(prefs::kSpellCheckDictionaries, dictionary);
+    pref->Set(spellcheck::prefs::kSpellCheckDictionaries, dictionary);
 
     EXPECT_FALSE(client_.IsAvailable(&profile_, kSuggest));
     EXPECT_TRUE(client_.IsAvailable(&profile_, kSpellcheck));
@@ -410,7 +410,7 @@ TEST_F(SpellingServiceClientTest, AvailableServices) {
     SCOPED_TRACE(std::string("Expected language ") + kUnsupported[i]);
     base::ListValue dictionary;
     dictionary.AppendString(kUnsupported[i]);
-    pref->Set(prefs::kSpellCheckDictionaries, dictionary);
+    pref->Set(spellcheck::prefs::kSpellCheckDictionaries, dictionary);
 
     EXPECT_TRUE(client_.IsAvailable(&profile_, kSuggest));
     EXPECT_FALSE(client_.IsAvailable(&profile_, kSpellcheck));