Componentize spellcheck [2]: move common/ files to component.

chrome/browser/spellchecker/spellcheck_service_browsertest.cc

 // Copyright (c) 2012 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_service.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <string>
 #include <tuple>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/values.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/spellchecker/spellcheck_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
-#include "chrome/common/spellcheck_common.h"
-#include "chrome/common/spellcheck_messages.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "components/prefs/pref_service.h"
+#include "components/spellcheck/common/spellcheck_common.h"
+#include "components/spellcheck/common/spellcheck_messages.h"
 #include "components/user_prefs/user_prefs.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "content/public/test/test_utils.h"
 #include "url/gurl.h"
 
 using content::BrowserContext;
 
 namespace {
 
 // A corrupted BDICT data used in DeleteCorruptedBDICT. Please do not use this
@@ skipping 218 matching lines @@
   EXPECT_TRUE(GetFirstEnableSpellcheckMessageParam());
 }
 
 // Tests that we can delete a corrupted BDICT file used by hunspell. We do not
 // run this test on Mac because Mac does not use hunspell by default.
 IN_PROC_BROWSER_TEST_F(SpellcheckServiceBrowserTest, DeleteCorruptedBDICT) {
   // Write the corrupted BDICT data to create a corrupted BDICT file.
   base::FilePath dict_dir;
   ASSERT_TRUE(PathService::Get(chrome::DIR_APP_DICTIONARIES, &dict_dir));
   base::FilePath bdict_path =
-      chrome::spellcheck_common::GetVersionedFileName("en-US", dict_dir);
+      spellcheck::GetVersionedFileName("en-US", dict_dir);
 
   size_t actual = base::WriteFile(bdict_path,
       reinterpret_cast<const char*>(kCorruptedBDICT),
       arraysize(kCorruptedBDICT));
   EXPECT_EQ(arraysize(kCorruptedBDICT), actual);
 
   // Attach an event to the SpellcheckService object so we can receive its
   // status updates.
   base::WaitableEvent event(base::WaitableEvent::ResetPolicy::MANUAL,
                             base::WaitableEvent::InitialState::NOT_SIGNALED);
@@ skipping 96 matching lines @@
   EXPECT_TRUE(GetPrefs()->GetBoolean(prefs::kEnableContinuousSpellcheck));
   EXPECT_EQ(2U, GetPrefs()->GetList(prefs::kSpellCheckDictionaries)->GetSize());
   std::string pref;
   ASSERT_TRUE(
       GetPrefs()->GetList(prefs::kSpellCheckDictionaries)->GetString(0, &pref));
   EXPECT_EQ("en-US", pref);
   ASSERT_TRUE(
       GetPrefs()->GetList(prefs::kSpellCheckDictionaries)->GetString(1, &pref));
   EXPECT_EQ("fr", pref);
 }