Update Chromium to use hunspell from third_party/hunspell_new.

After this, the next step will be to stop pulling hunspell in
third_party/hunspell through DEPS.

Removed the dependency on hunspell from chrome/browser/chromeos and chrome/browser/ui. Nothing in those places include from third_party/hunspell, so this dependency is not necessary and thus dropped.

BUG=472897
R=brettw@chromium.org
TBR=phajdan.jr@chromium.org # for checklicenses

Review URL: https://codereview.chromium.org/1121793003

Cr-Commit-Position: refs/heads/master@{#328719}

18 files changed, 26 insertions, 37 deletions

diff --git a/chrome/DEPS b/chrome/DEPS
index e014b07..c82a862 100644
--- a/chrome/DEPS
+++ b/chrome/DEPS
@@ -36,7 +36,7 @@ include_rules = [
   "+third_party/WebKit/public/web",
 
   # Allow inclusion of third-party code:
-  "+third_party/hunspell",
+  "+third_party/hunspell_new",
   "+third_party/libxml",
   "+third_party/mojo/src/mojo/public",
   "+third_party/skia",
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 0eae204..225e4e7 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -366,7 +366,7 @@ source_set("browser") {
     sources += rebase_path(gypi_values.chrome_browser_spellchecker_sources,
                            ".",
                            "//chrome")
-    deps += [ "//third_party/hunspell" ]
+    deps += [ "//third_party/hunspell_new" ]
   }
   if (enable_nacl) {
     sources +=
diff --git a/chrome/browser/chromeos/BUILD.gn b/chrome/browser/chromeos/BUILD.gn
index 1448c08..36c8015 100644
--- a/chrome/browser/chromeos/BUILD.gn
+++ b/chrome/browser/chromeos/BUILD.gn
@@ -91,7 +91,6 @@ source_set("chromeos") {
     "//third_party/adobe/flash:flapper_version_h",
     "//third_party/cacheinvalidation",
     "//third_party/expat",
-    "//third_party/hunspell",
     "//third_party/icu",
     "//third_party/leveldatabase",
     "//third_party/libevent",
diff --git a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
index b2e73c4..805c2a4 100644
--- a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
+++ b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
@@ -19,7 +19,7 @@
 #include "net/base/load_flags.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_context_getter.h"
-#include "third_party/hunspell/google/bdict.h"
+#include "third_party/hunspell_new/google/bdict.h"
 #include "url/gurl.h"
 
 using content::BrowserThread;
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
index 0db45d8..1d15e1d 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -98,7 +98,6 @@ source_set("ui") {
       "//third_party/WebKit/public:resources",
       "//third_party/adobe/flash:flapper_version_h",
       "//third_party/expat",
-      "//third_party/hunspell",
       "//third_party/leveldatabase",
       "//third_party/mojo/src/mojo/edk/system",
       "//third_party/npapi",
@@ -441,9 +440,6 @@ source_set("ui") {
                     ".",
                     "//chrome")
   }
-  if (enable_spellcheck) {
-    deps += [ "//third_party/hunspell" ]
-  }
 }
 
 if (is_mac) {
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 2911c21..66f1416 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -3291,7 +3291,7 @@
         ['enable_spellcheck==1', {
           'sources': [ '<@(chrome_browser_spellchecker_sources)' ],
           'dependencies': [
-            '../third_party/hunspell/hunspell.gyp:hunspell',
+            '../third_party/hunspell_new/hunspell.gyp:hunspell',
           ],
         }],
         ['disable_nacl==0', {
diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi
index 21fbb5d..5fc14dc 100644
--- a/chrome/chrome_browser_chromeos.gypi
+++ b/chrome/chrome_browser_chromeos.gypi
@@ -1172,7 +1172,6 @@
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_proto_cpp',
         '../third_party/expat/expat.gyp:expat',
-        '../third_party/hunspell/hunspell.gyp:hunspell',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index 6d723fe..165e704 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -3172,11 +3172,6 @@
         ['enable_service_discovery==1', {
           'sources': [ '<@(chrome_browser_ui_service_discovery_sources)' ],
         }],
-        ['enable_spellcheck==1', {
-          'dependencies': [
-            '../third_party/hunspell/hunspell.gyp:hunspell',
-          ],
-        }],
         ['enable_extensions==1', {
           'dependencies': [
             '<(DEPTH)/extensions/components/extensions_components.gyp:javascript_dialog_extensions_client',
diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi
index ac9a678..9609443 100644
--- a/chrome/chrome_renderer.gypi
+++ b/chrome/chrome_renderer.gypi
@@ -343,7 +343,7 @@
             '<@(chrome_renderer_spellchecker_sources)',
           ],
           'dependencies': [
-            '../third_party/hunspell/hunspell.gyp:hunspell',
+            '../third_party/hunspell_new/hunspell.gyp:hunspell',
           ],
         }],
         ['OS=="mac"', {
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index c22620e..5769e90 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1499,7 +1499,7 @@
         '../sync/sync.gyp:sync',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
-        '../third_party/hunspell/hunspell.gyp:hunspell',
+        '../third_party/hunspell_new/hunspell.gyp:hunspell',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/libpng/libpng.gyp:libpng',
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 559b911..47d96dc 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -2175,7 +2175,7 @@
           'sources': [ '<@(chrome_unit_tests_spellchecker_sources)' ],
           'conditions': [
             ['OS!="mac" and OS!="ios"', {
-              'dependencies': [ '../third_party/hunspell/hunspell.gyp:hunspell' ],
+              'dependencies': [ '../third_party/hunspell_new/hunspell.gyp:hunspell' ],
             }],
           ],
         }],
@@ -2444,7 +2444,7 @@
         }],
         ['OS!="mac" and OS!="ios"', {
           'dependencies': [
-            '../third_party/hunspell/hunspell.gyp:hunspell',
+            '../third_party/hunspell_new/hunspell.gyp:hunspell',
             'chrome_resources.gyp:packed_extra_resources',
             'chrome_resources.gyp:packed_resources',
             'tools/convert_dict/convert_dict.gyp:convert_dict_lib',
diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn
index 2fe4a66..cd1cb30 100644
--- a/chrome/renderer/BUILD.gn
+++ b/chrome/renderer/BUILD.gn
@@ -87,14 +87,14 @@ static_library("renderer") {
   }
 
   if (safe_browsing_mode != 0) {
-    sources += rebase_path(gypi_values.chrome_renderer_basic_safe_browsing_sources,
-                           ".",
-                           "..")
+    sources +=
+        rebase_path(gypi_values.chrome_renderer_basic_safe_browsing_sources,
+                    ".",
+                    "..")
     if (safe_browsing_mode == 1) {
-      sources +=
-          rebase_path(gypi_values.chrome_renderer_safe_browsing_sources,
-                      ".",
-                      "..")
+      sources += rebase_path(gypi_values.chrome_renderer_safe_browsing_sources,
+                             ".",
+                             "..")
       deps += [
         "//chrome/common/safe_browsing:proto",
         "//third_party/smhasher:murmurhash3",
@@ -138,7 +138,7 @@ static_library("renderer") {
   if (enable_spellcheck) {
     sources +=
         rebase_path(gypi_values.chrome_renderer_spellchecker_sources, ".", "..")
-    deps += [ "//third_party/hunspell" ]
+    deps += [ "//third_party/hunspell_new" ]
   }
 
   if (enable_basic_printing || enable_print_preview) {
diff --git a/chrome/renderer/spellchecker/hunspell_engine.cc b/chrome/renderer/spellchecker/hunspell_engine.cc
index b37f227..37d47b8 100644
--- a/chrome/renderer/spellchecker/hunspell_engine.cc
+++ b/chrome/renderer/spellchecker/hunspell_engine.cc
@@ -12,7 +12,7 @@
 #include "chrome/common/spellcheck_common.h"
 #include "chrome/common/spellcheck_messages.h"
 #include "content/public/renderer/render_thread.h"
-#include "third_party/hunspell/src/hunspell/hunspell.hxx"
+#include "third_party/hunspell_new/src/hunspell/hunspell.hxx"
 
 using content::RenderThread;
 
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 56817ba..f0a939e 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -255,7 +255,7 @@ if (!is_android) {
       "//sync",
       "//testing/gmock",
       "//testing/gtest",
-      "//third_party/hunspell",
+      "//third_party/hunspell_new",
       "//third_party/icu",
       "//third_party/libpng",
       "//third_party/npapi",
@@ -1292,7 +1292,7 @@ if (!is_android) {
                       ".",
                       "//chrome")
       if (is_mac && !is_ios) {
-        deps += [ "//third_party/hunspell" ]
+        deps += [ "//third_party/hunspell_new" ]
       }
     }
 
@@ -1569,7 +1569,7 @@ if (!is_android) {
     }
     if (!is_mac && !is_ios) {
       deps += [
-        "//third_party/hunspell",
+        "//third_party/hunspell_new",
         "//chrome:packed_extra_resources",
         "//chrome:packed_resources",
         "//chrome/tools/convert_dict:lib",
diff --git a/chrome/tools/convert_dict/BUILD.gn b/chrome/tools/convert_dict/BUILD.gn
index 108eb19..1c1c256 100644
--- a/chrome/tools/convert_dict/BUILD.gn
+++ b/chrome/tools/convert_dict/BUILD.gn
@@ -32,6 +32,6 @@ executable("convert_dict") {
     ":lib",
     "//base",
     "//base:i18n",
-    "//third_party/hunspell",
+    "//third_party/hunspell_new",
   ]
 }
diff --git a/chrome/tools/convert_dict/convert_dict.cc b/chrome/tools/convert_dict/convert_dict.cc
index 6566d91..29e4a1e 100644
--- a/chrome/tools/convert_dict/convert_dict.cc
+++ b/chrome/tools/convert_dict/convert_dict.cc
@@ -22,8 +22,8 @@
 #include "base/strings/string_util.h"
 #include "chrome/tools/convert_dict/aff_reader.h"
 #include "chrome/tools/convert_dict/dic_reader.h"
-#include "third_party/hunspell/google/bdict_reader.h"
-#include "third_party/hunspell/google/bdict_writer.h"
+#include "third_party/hunspell_new/google/bdict_reader.h"
+#include "third_party/hunspell_new/google/bdict_writer.h"
 
 namespace {
 
diff --git a/chrome/tools/convert_dict/convert_dict.gyp b/chrome/tools/convert_dict/convert_dict.gyp
index dc6b5b1..dc1ef8e 100644
--- a/chrome/tools/convert_dict/convert_dict.gyp
+++ b/chrome/tools/convert_dict/convert_dict.gyp
@@ -35,7 +35,7 @@
       'dependencies': [
         '../../../base/base.gyp:base',
         '../../../base/base.gyp:base_i18n',
-        '../../../third_party/hunspell/hunspell.gyp:hunspell',
+        '../../../third_party/hunspell_new/hunspell.gyp:hunspell',
         'convert_dict_lib',
       ],
       'sources': [
diff --git a/chrome/tools/convert_dict/convert_dict_unittest.cc b/chrome/tools/convert_dict/convert_dict_unittest.cc
index aa1cbd2..84b40a4 100644
--- a/chrome/tools/convert_dict/convert_dict_unittest.cc
+++ b/chrome/tools/convert_dict/convert_dict_unittest.cc
@@ -13,8 +13,8 @@
 #include "chrome/tools/convert_dict/aff_reader.h"
 #include "chrome/tools/convert_dict/dic_reader.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/hunspell/google/bdict_reader.h"
-#include "third_party/hunspell/google/bdict_writer.h"
+#include "third_party/hunspell_new/google/bdict_reader.h"
+#include "third_party/hunspell_new/google/bdict_writer.h"
 
 namespace {