Reduce source file entries in a spellcheck build file.

components/spellcheck/renderer/BUILD.gn

Index: components/spellcheck/renderer/BUILD.gn
diff --git a/components/spellcheck/renderer/BUILD.gn b/components/spellcheck/renderer/BUILD.gn
index eb323b2b4dae37c5099da1cf11d3ff581483df88..2af3945faf364107819578cea738def9a9c4d132 100644
--- a/components/spellcheck/renderer/BUILD.gn
+++ b/components/spellcheck/renderer/BUILD.gn
@@ -8,16 +8,10 @@ source_set("renderer") {
   sources = [
     "custom_dictionary_engine.cc",
     "custom_dictionary_engine.h",
-    "hunspell_engine.cc",
-    "hunspell_engine.h",
-    "platform_spelling_engine.cc",
-    "platform_spelling_engine.h",
     "spellcheck.cc",
     "spellcheck.h",
     "spellcheck_language.cc",
     "spellcheck_language.h",
-    "spellcheck_panel.cc",
-    "spellcheck_panel.h",
     "spellcheck_provider.cc",
     "spellcheck_provider.h",
     "spellcheck_worditerator.cc",
@@ -25,22 +19,22 @@ source_set("renderer") {
     "spelling_engine.h",
   ]
 
-  if (!use_browser_spellchecker) {
-    sources -= [
+  if (use_browser_spellchecker) {
+    sources += [
       "platform_spelling_engine.cc",
       "platform_spelling_engine.h",
     ]
   }
 
-  if (!has_spellcheck_panel) {
-    sources -= [
+  if (has_spellcheck_panel) {
+    sources += [
       "spellcheck_panel.cc",
       "spellcheck_panel.h",
     ]
   }
 
-  if (is_android) {
-    sources -= [
+  if (!is_android) {

[please use gerrit instead, 2017/04/18 13:27:52]

nit: Can these files be removed from Mac as well?

[Lei Zhang, 2017/04/18 18:46:36]

Probably, but I'm strictly refactoring here. Maybe what you want after this is a
use_hunspell variable?

+    sources += [
       "hunspell_engine.cc",
       "hunspell_engine.h",
     ]
@@ -71,32 +65,25 @@ source_set("unit_tests") {
   testonly = true
   sources = [
     "custom_dictionary_engine_unittest.cc",
-    "spellcheck_multilingual_unittest.cc",
-    "spellcheck_provider_hunspell_unittest.cc",
     "spellcheck_provider_mac_unittest.cc",
     "spellcheck_provider_test.cc",
     "spellcheck_provider_test.h",
     "spellcheck_provider_unittest.cc",
-    "spellcheck_unittest.cc",
     "spellcheck_worditerator_unittest.cc",
   ]
   data = [
     "//third_party/hunspell_dictionaries/",
   ]
 
-  if (is_mac) {
-    sources -= [
-      # This tests Chrome's spellchecker which Mac doesn't use.
-      "spellcheck_multilingual_unittest.cc",
-      "spellcheck_provider_hunspell_unittest.cc",
-    ]
+  if (!is_android) {
+    sources += [ "spellcheck_unittest.cc" ]
   }
 
-  if (is_android) {
-    sources -= [
+  if (!is_mac && !is_android) {
+    sources += [
+      # This tests Chrome's spellchecker which Mac doesn't use.
       "spellcheck_multilingual_unittest.cc",
       "spellcheck_provider_hunspell_unittest.cc",
-      "spellcheck_unittest.cc",
     ]
   }