Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(50)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/spellchecker/spellcheck_custom_dictionary_unittest.cc

Issue 2159283003: [WIP][DO NOT LAND] Componentize spellcheck Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/spellchecker/spellcheck_custom_dictionary.cc ('k') | chrome/browser/spellchecker/spellcheck_dictionary.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/spellchecker/spellcheck_custom_dictionary_unittest.cc
diff --git a/chrome/browser/spellchecker/spellcheck_custom_dictionary_unittest.cc b/chrome/browser/spellchecker/spellcheck_custom_dictionary_unittest.cc
index 8ed2ebe6a4b428fa3264754f3578d9cb61496073..e747e285cbc873c6b9dc73d4cc0faaa6e27baa03 100644
--- a/chrome/browser/spellchecker/spellcheck_custom_dictionary_unittest.cc
+++ b/chrome/browser/spellchecker/spellcheck_custom_dictionary_unittest.cc
@@ -19,10 +19,11 @@
#include "base/strings/string_number_conversions.h"
#include "build/build_config.h"
#include "chrome/browser/spellchecker/spellcheck_factory.h"
-#include "chrome/browser/spellchecker/spellcheck_host_metrics.h"
+#include "components/spellcheck/browser/spellcheck_host_metrics.h"
+#include "components/spellcheck/common/spellcheck_common.h"
#include "chrome/browser/spellchecker/spellcheck_service.h"
-#include "chrome/common/chrome_constants.h"
-#include "chrome/common/spellcheck_common.h"
+//#include "chrome/common/chrome_constants.h"
+#include "components/spellcheck/common/spellcheck_common.h"
#include "chrome/test/base/testing_profile.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "net/url_request/test_url_fetcher_factory.h"
@@ -170,7 +171,7 @@ class DictionaryObserverCounter : public SpellcheckCustomDictionary::Observer {
TEST_F(SpellcheckCustomDictionaryTest, SaveAndLoad) {
base::FilePath path =
- profile_.GetPath().Append(chrome::kCustomDictionaryFileName);
+ profile_.GetPath().Append(SpellcheckCustomDictionary::kCustomDictionaryFileName);
// The custom word list should be empty now.
EXPECT_TRUE(LoadDictionaryFile(path)->words.empty());
@@ -232,7 +233,7 @@ TEST_F(SpellcheckCustomDictionaryTest, MultiProfile) {
// Legacy empty dictionary should be converted to new format empty dictionary.
TEST_F(SpellcheckCustomDictionaryTest, LegacyEmptyDictionaryShouldBeConverted) {
base::FilePath path =
- profile_.GetPath().Append(chrome::kCustomDictionaryFileName);
+ profile_.GetPath().Append(SpellcheckCustomDictionary::kCustomDictionaryFileName);
std::string content;
base::WriteFile(path, content.c_str(), content.length());
@@ -244,7 +245,7 @@ TEST_F(SpellcheckCustomDictionaryTest, LegacyEmptyDictionaryShouldBeConverted) {
TEST_F(SpellcheckCustomDictionaryTest,
LegacyDictionaryWithTwoWordsShouldBeConverted) {
base::FilePath path =
- profile_.GetPath().Append(chrome::kCustomDictionaryFileName);
+ profile_.GetPath().Append(SpellcheckCustomDictionary::kCustomDictionaryFileName);
std::string content = "foo\nbar\nfoo\n";
base::WriteFile(path, content.c_str(), content.length());
@@ -259,7 +260,7 @@ TEST_F(SpellcheckCustomDictionaryTest,
TEST_F(SpellcheckCustomDictionaryTest,
IllegalWordsShouldBeRemovedFromDictionary) {
base::FilePath path =
- profile_.GetPath().Append(chrome::kCustomDictionaryFileName);
+ profile_.GetPath().Append(SpellcheckCustomDictionary::kCustomDictionaryFileName);
std::string content = "foo\n foo bar \n\n \nbar\n"
"01234567890123456789012345678901234567890123456789"
@@ -277,7 +278,7 @@ TEST_F(SpellcheckCustomDictionaryTest,
// previous version should be reloaded.
TEST_F(SpellcheckCustomDictionaryTest, CorruptedWriteShouldBeRecovered) {
base::FilePath path =
- profile_.GetPath().Append(chrome::kCustomDictionaryFileName);
+ profile_.GetPath().Append(SpellcheckCustomDictionary::kCustomDictionaryFileName);
std::string content = "foo\nbar";
base::WriteFile(path, content.c_str(), content.length());
@@ -335,32 +336,32 @@ TEST_F(SpellcheckCustomDictionaryTest, GetAllSyncDataHasLimit) {
SpellcheckCustomDictionary::Change change;
for (size_t i = 0;
- i < chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS - 1;
+ i < spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS - 1;
i++) {
change.AddWord("foo" + base::Uint64ToString(i));
}
Apply(*dictionary, change);
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS - 1,
+ EXPECT_EQ(spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS - 1,
dictionary->GetWords().size());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS - 1,
+ EXPECT_EQ(spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS - 1,
dictionary->GetAllSyncData(syncer::DICTIONARY).size());
dictionary->AddWord("baz");
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
+ EXPECT_EQ(spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
dictionary->GetWords().size());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
+ EXPECT_EQ(spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
dictionary->GetAllSyncData(syncer::DICTIONARY).size());
dictionary->AddWord("bar");
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS + 1,
+ EXPECT_EQ(spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS + 1,
dictionary->GetWords().size());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
+ EXPECT_EQ(spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
dictionary->GetAllSyncData(syncer::DICTIONARY).size());
dictionary->AddWord("snafoo");
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS + 2,
+ EXPECT_EQ(spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS + 2,
dictionary->GetWords().size());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
+ EXPECT_EQ(spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
dictionary->GetAllSyncData(syncer::DICTIONARY).size());
}
@@ -450,7 +451,7 @@ TEST_F(SpellcheckCustomDictionaryTest, MergeDataAndStartSyncing) {
SpellcheckCustomDictionary::Change change;
for (size_t i = 0;
- i < chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS / 2;
+ i < spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS / 2;
++i) {
change.AddWord("foo" + base::Uint64ToString(i));
}
@@ -458,7 +459,7 @@ TEST_F(SpellcheckCustomDictionaryTest, MergeDataAndStartSyncing) {
SpellcheckCustomDictionary::Change change2;
for (size_t i = 0;
- i < chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS / 2;
+ i < spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS / 2;
++i) {
change2.AddWord("bar" + base::Uint64ToString(i));
}
@@ -502,7 +503,7 @@ TEST_F(SpellcheckCustomDictionaryTest, SyncBeforeLoadDoesNotDuplicateWords) {
Apply(*custom_dictionary2, *change);
base::FilePath path =
- profile_.GetPath().Append(chrome::kCustomDictionaryFileName);
+ profile_.GetPath().Append(SpellcheckCustomDictionary::kCustomDictionaryFileName);
UpdateDictionaryFile(std::move(change), path);
EXPECT_TRUE(custom_dictionary->GetWords().empty());
@@ -551,7 +552,7 @@ TEST_F(SpellcheckCustomDictionaryTest, DictionaryTooBigBeforeSyncing) {
SpellcheckCustomDictionary::Change change;
for (size_t i = 0;
- i < chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS + 1;
+ i < spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS + 1;
++i) {
change.AddWord("foo" + base::Uint64ToString(i));
}
@@ -572,14 +573,14 @@ TEST_F(SpellcheckCustomDictionaryTest, DictionaryTooBigBeforeSyncing) {
EXPECT_EQ(0, error_counter);
EXPECT_FALSE(custom_dictionary->IsSyncing());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS + 1,
+ EXPECT_EQ(spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS + 1,
custom_dictionary->GetWords().size());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
+ EXPECT_EQ(spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
custom_dictionary2->GetWords().size());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
+ EXPECT_EQ(spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
custom_dictionary->GetAllSyncData(syncer::DICTIONARY).size());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
+ EXPECT_EQ(spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
custom_dictionary2->GetAllSyncData(syncer::DICTIONARY).size());
}
@@ -599,7 +600,7 @@ TEST_F(SpellcheckCustomDictionaryTest, DictionaryTooBigAndServerFull) {
SpellcheckCustomDictionary::Change change;
SpellcheckCustomDictionary::Change change2;
for (size_t i = 0;
- i < chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS;
+ i < spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS;
++i) {
change.AddWord("foo" + base::Uint64ToString(i));
change2.AddWord("bar" + base::Uint64ToString(i));
@@ -608,9 +609,9 @@ TEST_F(SpellcheckCustomDictionaryTest, DictionaryTooBigAndServerFull) {
Apply(*custom_dictionary, change);
Apply(*custom_dictionary2, change2);
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS + 1,
+ EXPECT_EQ(spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS + 1,
custom_dictionary->GetWords().size());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
+ EXPECT_EQ(spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
custom_dictionary2->GetWords().size());
int error_counter = 0;
@@ -628,14 +629,14 @@ TEST_F(SpellcheckCustomDictionaryTest, DictionaryTooBigAndServerFull) {
EXPECT_EQ(0, error_counter);
EXPECT_FALSE(custom_dictionary->IsSyncing());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS * 2 + 1,
+ EXPECT_EQ(spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS * 2 + 1,
custom_dictionary->GetWords().size());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
+ EXPECT_EQ(spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
custom_dictionary2->GetWords().size());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
+ EXPECT_EQ(spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
custom_dictionary->GetAllSyncData(syncer::DICTIONARY).size());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
+ EXPECT_EQ(spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
custom_dictionary2->GetAllSyncData(syncer::DICTIONARY).size());
}
@@ -655,7 +656,7 @@ TEST_F(SpellcheckCustomDictionaryTest, ServerTooBig) {
SpellcheckCustomDictionary::Change change;
SpellcheckCustomDictionary::Change change2;
for (size_t i = 0;
- i < chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS + 1;
+ i < spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS + 1;
++i) {
change.AddWord("foo" + base::Uint64ToString(i));
change2.AddWord("bar" + base::Uint64ToString(i));
@@ -663,9 +664,9 @@ TEST_F(SpellcheckCustomDictionaryTest, ServerTooBig) {
Apply(*custom_dictionary, change);
Apply(*custom_dictionary2, change2);
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS + 1,
+ EXPECT_EQ(spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS + 1,
custom_dictionary->GetWords().size());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS + 1,
+ EXPECT_EQ(spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS + 1,
custom_dictionary2->GetWords().size());
int error_counter = 0;
@@ -683,14 +684,14 @@ TEST_F(SpellcheckCustomDictionaryTest, ServerTooBig) {
EXPECT_EQ(0, error_counter);
EXPECT_FALSE(custom_dictionary->IsSyncing());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS * 2 + 2,
+ EXPECT_EQ(spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS * 2 + 2,
custom_dictionary->GetWords().size());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS + 1,
+ EXPECT_EQ(spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS + 1,
custom_dictionary2->GetWords().size());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
+ EXPECT_EQ(spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
custom_dictionary->GetAllSyncData(syncer::DICTIONARY).size());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
+ EXPECT_EQ(spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
custom_dictionary2->GetAllSyncData(syncer::DICTIONARY).size());
}
@@ -709,7 +710,7 @@ TEST_F(SpellcheckCustomDictionaryTest, DictionaryTooBigToStartSyncing) {
SpellcheckCustomDictionary::Change change;
for (size_t i = 0;
- i < chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS - 1;
+ i < spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS - 1;
++i) {
change.AddWord("foo" + base::Uint64ToString(i));
}
@@ -733,14 +734,14 @@ TEST_F(SpellcheckCustomDictionaryTest, DictionaryTooBigToStartSyncing) {
EXPECT_EQ(0, error_counter);
EXPECT_FALSE(custom_dictionary->IsSyncing());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS + 1,
+ EXPECT_EQ(spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS + 1,
custom_dictionary->GetWords().size());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
+ EXPECT_EQ(spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
custom_dictionary2->GetWords().size());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
+ EXPECT_EQ(spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
custom_dictionary->GetAllSyncData(syncer::DICTIONARY).size());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
+ EXPECT_EQ(spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
custom_dictionary2->GetAllSyncData(syncer::DICTIONARY).size());
}
@@ -759,7 +760,7 @@ TEST_F(SpellcheckCustomDictionaryTest, DictionaryTooBigToContiueSyncing) {
SpellcheckCustomDictionary::Change change;
for (size_t i = 0;
- i < chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS - 1;
+ i < spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS - 1;
++i) {
change.AddWord("foo" + base::Uint64ToString(i));
}
@@ -788,14 +789,14 @@ TEST_F(SpellcheckCustomDictionaryTest, DictionaryTooBigToContiueSyncing) {
EXPECT_EQ(0, error_counter);
EXPECT_FALSE(custom_dictionary->IsSyncing());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS + 1,
+ EXPECT_EQ(spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS + 1,
custom_dictionary->GetWords().size());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
+ EXPECT_EQ(spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
custom_dictionary2->GetWords().size());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
+ EXPECT_EQ(spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
custom_dictionary->GetAllSyncData(syncer::DICTIONARY).size());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
+ EXPECT_EQ(spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
custom_dictionary2->GetAllSyncData(syncer::DICTIONARY).size());
}
@@ -875,7 +876,7 @@ TEST_F(SpellcheckCustomDictionaryTest, LoadAfterSyncStartTooBigToSync) {
std::unique_ptr<std::set<std::string>> custom_words(
new std::set<std::string>);
for (size_t i = 0;
- i < chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS;
+ i < spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS;
++i) {
custom_words->insert(custom_words->end(), "foo" + base::Uint64ToString(i));
}
@@ -883,14 +884,14 @@ TEST_F(SpellcheckCustomDictionaryTest, LoadAfterSyncStartTooBigToSync) {
EXPECT_EQ(0, error_counter);
EXPECT_FALSE(custom_dictionary->IsSyncing());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS + 1,
+ EXPECT_EQ(spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS + 1,
custom_dictionary->GetWords().size());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
+ EXPECT_EQ(spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
custom_dictionary2->GetWords().size());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
+ EXPECT_EQ(spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
custom_dictionary->GetAllSyncData(syncer::DICTIONARY).size());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
+ EXPECT_EQ(spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
custom_dictionary2->GetAllSyncData(syncer::DICTIONARY).size());
}
@@ -909,7 +910,7 @@ TEST_F(SpellcheckCustomDictionaryTest, LoadDuplicatesAfterSync) {
SpellcheckCustomDictionary::Change change;
for (size_t i = 0;
- i < chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS / 2;
+ i < spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS / 2;
++i) {
change.AddWord("foo" + base::Uint64ToString(i));
}
@@ -935,14 +936,14 @@ TEST_F(SpellcheckCustomDictionaryTest, LoadDuplicatesAfterSync) {
EXPECT_EQ(0, error_counter);
EXPECT_TRUE(custom_dictionary->IsSyncing());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS / 2,
+ EXPECT_EQ(spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS / 2,
custom_dictionary->GetWords().size());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS / 2,
+ EXPECT_EQ(spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS / 2,
custom_dictionary2->GetWords().size());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS / 2,
+ EXPECT_EQ(spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS / 2,
custom_dictionary->GetAllSyncData(syncer::DICTIONARY).size());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS / 2,
+ EXPECT_EQ(spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS / 2,
custom_dictionary2->GetAllSyncData(syncer::DICTIONARY).size());
}
@@ -1084,7 +1085,7 @@ TEST_F(SpellcheckCustomDictionaryTest, DictionarySyncLimit) {
SpellcheckCustomDictionary::Change change;
for (size_t i = 0;
- i < chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS;
+ i < spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS;
++i) {
change.AddWord("foo" + base::Uint64ToString(i));
}
@@ -1105,12 +1106,12 @@ TEST_F(SpellcheckCustomDictionaryTest, DictionarySyncLimit) {
.IsSet());
EXPECT_EQ(0, error_counter);
EXPECT_TRUE(custom_dictionary->IsSyncing());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
+ EXPECT_EQ(spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
custom_dictionary->GetWords().size());
}
// The sync server now has the maximum number of words.
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
+ EXPECT_EQ(spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
server_custom_dictionary->GetWords().size());
// Associate the sync server with a client that also has the maximum number of
@@ -1131,7 +1132,7 @@ TEST_F(SpellcheckCustomDictionaryTest, DictionarySyncLimit) {
// different from those on the server.
SpellcheckCustomDictionary::Change change;
for (size_t i = 0;
- i < chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS;
+ i < spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS;
++i) {
change.AddWord("bar" + base::Uint64ToString(i));
}
@@ -1153,13 +1154,13 @@ TEST_F(SpellcheckCustomDictionaryTest, DictionarySyncLimit) {
.IsSet());
EXPECT_EQ(0, error_counter);
EXPECT_FALSE(client_custom_dictionary->IsSyncing());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS * 2,
+ EXPECT_EQ(spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS * 2,
client_custom_dictionary->GetWords().size());
}
// The sync server should not receive more words, because it has the maximum
// number of words already.
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
+ EXPECT_EQ(spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
server_custom_dictionary->GetWords().size());
}
@@ -1183,7 +1184,7 @@ TEST_F(SpellcheckCustomDictionaryTest, RecordSizeStatsCorrectly) {
// Load the dictionary which should be empty.
base::FilePath path =
- profile_.GetPath().Append(chrome::kCustomDictionaryFileName);
+ profile_.GetPath().Append(SpellcheckCustomDictionary::kCustomDictionaryFileName);
EXPECT_TRUE(LoadDictionaryFile(path)->words.empty());
// We expect there to be an entry with 0.
« no previous file with comments | « chrome/browser/spellchecker/spellcheck_custom_dictionary.cc ('k') | chrome/browser/spellchecker/spellcheck_dictionary.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698