summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build/all.gyp1
-rw-r--r--build/common.gypi16
-rw-r--r--chrome/chrome_common.gypi11
-rw-r--r--chrome/chrome_dll.gypi11
-rw-r--r--chrome/chrome_tests.gypi2
-rw-r--r--chrome/chrome_tests_unit.gypi26
-rw-r--r--chrome/common/DEPS1
-rw-r--r--chrome/common/translate/language_detection_util.cc100
-rw-r--r--third_party/cld/README.chromium2
-rw-r--r--third_party/cld_2/LICENSE202
-rw-r--r--third_party/cld_2/OWNERS3
-rw-r--r--third_party/cld_2/README.chromium10
-rw-r--r--third_party/cld_2/cld_2.gyp71
13 files changed, 24 insertions, 432 deletions
diff --git a/build/all.gyp b/build/all.gyp
index ce9d61f..32ad72a 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -46,6 +46,7 @@
'../printing/printing.gyp:*',
'../skia/skia.gyp:*',
'../third_party/cacheinvalidation/cacheinvalidation.gyp:*',
+ '../third_party/cld/cld.gyp:*',
'../third_party/codesighs/codesighs.gyp:*',
'../third_party/ffmpeg/ffmpeg.gyp:*',
'../third_party/iccjpeg/iccjpeg.gyp:*',
diff --git a/build/common.gypi b/build/common.gypi
index 10d0c09..7df3e83 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -341,12 +341,6 @@
# print, UI, etc.
'enable_printing%': 1,
- # Set the version of CLD.
- # 0: Don't specify the version. This option is for the Finch testing.
- # 1: Use only CLD1.
- # 2: Use only CLD2.
- 'cld_version%': 0,
-
# Enable spell checker.
'enable_spellcheck%': 1,
@@ -516,15 +510,10 @@
'enable_one_click_signin%': 1,
}],
- ['OS=="win"', {
- 'cld_version%': 1,
- }],
-
['OS=="android"', {
'enable_automation%': 0,
'enable_extensions%': 0,
'enable_google_now%': 0,
- 'cld_version%': 1,
'enable_spellcheck%': 0,
'enable_themes%': 0,
'remoting%': 0,
@@ -574,7 +563,6 @@
'enable_automation%': 0,
'enable_extensions%': 0,
'enable_google_now%': 0,
- 'cld_version%': 1,
'enable_printing%': 0,
'enable_session_service%': 0,
'enable_themes%': 0,
@@ -863,7 +851,6 @@
'enable_printing%': '<(enable_printing)',
'enable_spellcheck%': '<(enable_spellcheck)',
'enable_google_now%': '<(enable_google_now)',
- 'cld_version%': '<(cld_version)',
'enable_captive_portal_detection%': '<(enable_captive_portal_detection)',
'disable_ftp_support%': '<(disable_ftp_support)',
'enable_task_manager%': '<(enable_task_manager)',
@@ -2285,9 +2272,6 @@
['enable_google_now==1', {
'defines': ['ENABLE_GOOGLE_NOW=1'],
}],
- ['cld_version!=0', {
- 'defines': ['CLD_VERSION=<(cld_version)'],
- }],
['enable_printing==1', {
'defines': ['ENABLE_FULL_PRINTING=1', 'ENABLE_PRINTING=1'],
}],
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index c50836c..7e4af84 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -24,6 +24,7 @@
# TODO(gregoryd): chrome_resources and chrome_strings could be
# shared with the 64-bit target, but it does not work due to a gyp
# issue.
+ '../third_party/cld/cld.gyp:cld',
'common_net',
'common_version',
'installer_util',
@@ -666,16 +667,6 @@
'common/print_messages.h',
]
}],
- ['cld_version==0 or cld_version==1', {
- 'dependencies': [
- '<(DEPTH)/third_party/cld/cld.gyp:cld',
- ],
- }],
- ['cld_version==0 or cld_version==2', {
- 'dependencies': [
- '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld_2',
- ],
- }],
],
'target_conditions': [
['OS == "ios"', {
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index e7afe04..c1e12a2 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -107,6 +107,7 @@
'../crypto/crypto.gyp:crypto',
'../printing/printing.gyp:printing',
'../net/net.gyp:net_resources',
+ '../third_party/cld/cld.gyp:cld',
'../ui/views/views.gyp:views',
'../webkit/webkit_resources.gyp:webkit_resources',
],
@@ -232,16 +233,6 @@
'../content/content.gyp:content_app_browser',
],
}],
- ['cld_version==0 or cld_version==1', {
- 'dependencies': [
- '../third_party/cld/cld.gyp:cld',
- ],
- }],
- ['cld_version==0 or cld_version==2', {
- 'dependencies': [
- '../third_party/cld_2/cld_2.gyp:cld_2',
- ],
- }],
['OS=="mac" and component!="shared_library"', {
'includes': [ 'chrome_dll_bundle.gypi' ],
}],
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 33a5ac6..861b031 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1151,6 +1151,7 @@
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
'../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
+ '../third_party/cld/cld.gyp:cld',
'../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc',
'../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
@@ -2164,6 +2165,7 @@
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
'../testing/perf/perf_test.gyp:*',
+ '../third_party/cld/cld.gyp:cld',
'../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc',
'../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 0461a11..7bad8b0 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -487,6 +487,14 @@
'include_dirs': [
'..',
],
+ 'defines': [
+ 'CLD_WINDOWS',
+ ],
+ 'direct_dependent_settings': {
+ 'defines': [
+ 'CLD_WINDOWS',
+ ],
+ },
'msvs_settings': {
'VCLinkerTool': {
'conditions': [
@@ -1932,6 +1940,7 @@
'../skia/ext/skia_utils_mac_unittest.mm',
'../skia/ext/vector_canvas_unittest.cc',
'../testing/gtest_mac_unittest.mm',
+ '../third_party/cld/encodings/compact_lang_det/compact_lang_det_unittest_small.cc',
'../third_party/zlib/google/zip_reader_unittest.cc',
'../third_party/zlib/google/zip_unittest.cc',
'../tools/json_schema_compiler/test/additional_properties_unittest.cc',
@@ -1969,6 +1978,7 @@
'../gpu/gpu.gyp:gpu_unittest_utils',
'../media/media.gyp:media_test_support',
'../ppapi/ppapi_internal.gyp:ppapi_unittest_shared',
+ '../third_party/cld/cld.gyp:cld',
'../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
'../third_party/libjingle/libjingle.gyp:libjingle',
'../third_party/libphonenumber/libphonenumber.gyp:libphonenumber',
@@ -2625,22 +2635,6 @@
['exclude', '^browser/extensions/blacklist_unittest.cc'],
],
}],
- ['cld_version==0 or cld_version==1', {
- 'defines': [
- 'CLD_WINDOWS',
- ],
- 'direct_dependent_settings': {
- 'defines': [
- 'CLD_WINDOWS',
- ],
- },
- 'sources': [
- '../third_party/cld/encodings/compact_lang_det/compact_lang_det_unittest_small.cc',
- ],
- 'dependencies': [
- '../third_party/cld/cld.gyp:cld',
- ],
- }],
],
'target_conditions': [
['OS == "ios"', {
diff --git a/chrome/common/DEPS b/chrome/common/DEPS
index a8dafbc..18b6bce 100644
--- a/chrome/common/DEPS
+++ b/chrome/common/DEPS
@@ -26,7 +26,6 @@ include_rules = [
"+third_party/bzip2",
"+third_party/cld",
"+third_party/cld/encodings/compact_lang_det/win",
- "+third_party/cld_2/src",
"+third_party/mt19937ar",
"+third_party/npapi",
"+third_party/re2",
diff --git a/chrome/common/translate/language_detection_util.cc b/chrome/common/translate/language_detection_util.cc
index ccb6154..73e4823 100644
--- a/chrome/common/translate/language_detection_util.cc
+++ b/chrome/common/translate/language_detection_util.cc
@@ -5,23 +5,14 @@
#include "chrome/common/translate/language_detection_util.h"
#include "base/logging.h"
-#include "base/metrics/field_trial.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
-#include "base/strings/utf_string_conversions.h"
#include "base/time/time.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/common/translate/translate_common_metrics.h"
#include "chrome/common/translate/translate_util.h"
-
-#if !defined(CLD_VERSION) || CLD_VERSION==1
#include "third_party/cld/encodings/compact_lang_det/compact_lang_det.h"
#include "third_party/cld/encodings/compact_lang_det/win/cld_unicodetext.h"
-#endif
-
-#if !defined(CLD_VERSION) || CLD_VERSION==2
-#include "third_party/cld_2/src/public/compact_lang_det.h"
-#endif
namespace {
@@ -70,63 +61,18 @@ void ApplyLanguageCodeCorrection(std::string* code) {
TranslateUtil::ToTranslateLanguageSynonym(code);
}
-int GetCLDMajorVersion() {
-#if !defined(CLD_VERSION)
- std::string group_name = base::FieldTrialList::FindFullName("CLD1VsCLD2");
- if (group_name == "CLD2")
- return 2;
- else
- return 1;
-#else
- return CLD_VERSION;
-#endif
-}
-
// Returns the ISO 639 language code of the specified |text|, or 'unknown' if it
// failed.
// |is_cld_reliable| will be set as true if CLD says the detection is reliable.
std::string DetermineTextLanguage(const base::string16& text,
bool* is_cld_reliable) {
std::string language = chrome::kUnknownLanguageCode;
+ int num_languages = 0;
int text_bytes = 0;
bool is_reliable = false;
-
- // Language or CLD2::Language
- int cld_language = 0;
- bool is_valid_language = false;
-
- switch (GetCLDMajorVersion()) {
-#if !defined(CLD_VERSION) || CLD_VERSION==1
- case 1: {
- int num_languages = 0;
- cld_language =
- DetectLanguageOfUnicodeText(NULL, text.c_str(), true, &is_reliable,
- &num_languages, NULL, &text_bytes);
- is_valid_language = cld_language != NUM_LANGUAGES &&
- cld_language != UNKNOWN_LANGUAGE &&
- cld_language != TG_UNKNOWN_LANGUAGE;
- break;
- }
-#endif
-#if !defined(CLD_VERSION) || CLD_VERSION==2
- case 2: {
- std::string utf8_text(UTF16ToUTF8(text));
- CLD2::Language language3[3];
- int percent3[3];
- cld_language =
- CLD2::DetectLanguageSummary(utf8_text.c_str(), utf8_text.size(), true,
- language3, percent3,
- &text_bytes, &is_reliable);
- is_valid_language = cld_language != CLD2::NUM_LANGUAGES &&
- cld_language != CLD2::UNKNOWN_LANGUAGE &&
- cld_language != CLD2::TG_UNKNOWN_LANGUAGE;
- break;
- }
-#endif
- default:
- NOTREACHED();
- }
-
+ Language cld_language =
+ DetectLanguageOfUnicodeText(NULL, text.c_str(), true, &is_reliable,
+ &num_languages, NULL, &text_bytes);
if (is_cld_reliable != NULL)
*is_cld_reliable = is_reliable;
@@ -136,33 +82,15 @@ std::string DetermineTextLanguage(const base::string16& text,
// TODO(toyoshim): CLD provides |is_reliable| flag. But, it just says that
// the determined language code is correct with 50% confidence. Chrome should
// handle the real confidence value to judge.
- if (is_reliable && text_bytes >= 100 && is_valid_language) {
+ if (is_reliable && text_bytes >= 100 && cld_language != NUM_LANGUAGES &&
+ cld_language != UNKNOWN_LANGUAGE && cld_language != TG_UNKNOWN_LANGUAGE) {
// We should not use LanguageCode_ISO_639_1 because it does not cover all
// the languages CLD can detect. As a result, it'll return the invalid
// language code for tradtional Chinese among others.
// |LanguageCodeWithDialect| will go through ISO 639-1, ISO-639-2 and
// 'other' tables to do the 'right' thing. In addition, it'll return zh-CN
// for Simplified Chinese.
- switch (GetCLDMajorVersion()) {
-#if !defined(CLD_VERSION) || CLD_VERSION==1
- case 1:
- language =
- LanguageCodeWithDialects(static_cast<Language>(cld_language));
- break;
-#endif
-#if !defined(CLD_VERSION) || CLD_VERSION==2
- case 2:
- if (cld_language == CLD2::CHINESE) {
- language = "zh-CN";
- } else {
- language =
- CLD2::LanguageCode(static_cast<CLD2::Language>(cld_language));
- }
- break;
-#endif
- default:
- NOTREACHED();
- }
+ language = LanguageCodeWithDialects(cld_language);
}
VLOG(9) << "Detected lang_id: " << language << ", from Text:\n" << text
<< "\n*************************************\n";
@@ -363,19 +291,7 @@ bool MaybeServerWrongConfiguration(const std::string& page_language,
}
std::string GetCLDVersion() {
- switch (GetCLDMajorVersion()) {
-#if !defined(CLD_VERSION) || CLD_VERSION==1
- case 1:
- return CompactLangDet::DetectLanguageVersion();
-#endif
-#if !defined(CLD_VERSION) || CLD_VERSION==2
- case 2:
- return CLD2::DetectLanguageVersion();
-#endif
- default:
- NOTREACHED();
- }
- return "";
+ return CompactLangDet::DetectLanguageVersion();
}
} // namespace LanguageDetectionUtil
diff --git a/third_party/cld/README.chromium b/third_party/cld/README.chromium
index 35074cc..af2df72 100644
--- a/third_party/cld/README.chromium
+++ b/third_party/cld/README.chromium
@@ -1,7 +1,7 @@
Name: Compact Language Detection
Short Name: cld
URL: http://src.chromium.org/viewvc/chrome/trunk/src/third_party/cld/
-Version: 0
+Version: unknown
License: BSD
Security Critical: yes
diff --git a/third_party/cld_2/LICENSE b/third_party/cld_2/LICENSE
deleted file mode 100644
index d645695..0000000
--- a/third_party/cld_2/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
diff --git a/third_party/cld_2/OWNERS b/third_party/cld_2/OWNERS
deleted file mode 100644
index a214ab1..0000000
--- a/third_party/cld_2/OWNERS
+++ /dev/null
@@ -1,3 +0,0 @@
-hajimehoshi@chromium.org
-mad@chromium.org
-toyoshim@chromium.org
diff --git a/third_party/cld_2/README.chromium b/third_party/cld_2/README.chromium
deleted file mode 100644
index b203255..0000000
--- a/third_party/cld_2/README.chromium
+++ /dev/null
@@ -1,10 +0,0 @@
-Name: Compact Language Detection 2
-Short Name: cld_2
-URL: https://code.google.com/p/cld2/
-Version: 0
-License: Apache 2.0
-Security Critical: yes
-
-Description:
-The CLD is used to determine the language of text. In Chromium, this is used
-to determine if Chrome should offer Translate UX to the user.
diff --git a/third_party/cld_2/cld_2.gyp b/third_party/cld_2/cld_2.gyp
deleted file mode 100644
index 41f229d..0000000
--- a/third_party/cld_2/cld_2.gyp
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 2013 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.
-
-{
- 'targets': [
- {
- 'target_name': 'cld_2',
- 'type': 'static_library',
- 'include_dirs': [
- 'src/internal',
- 'src/public',
- ],
- 'sources': [
- 'src/internal/cld2_generated_cjk_compatible.cc',
- 'src/internal/cld2_generated_deltaoctachrome0614.cc',
- 'src/internal/cld2_generated_distinctoctachrome0604.cc',
- 'src/internal/cld2_generated_octa2_dummy.cc',
- 'src/internal/cld2_generated_quadchrome0715.cc',
- 'src/internal/cld2tablesummary.h',
- 'src/internal/cld_generated_cjk_delta_bi_32.cc',
- 'src/internal/cld_generated_cjk_delta_bi_4.cc',
- 'src/internal/cld_generated_cjk_uni_prop_80.cc',
- 'src/internal/cld_generated_score_quad_octa_1024_256.cc',
- 'src/internal/cldutil.cc',
- 'src/internal/cldutil.h',
- 'src/internal/cldutil_offline.cc',
- 'src/internal/cldutil_offline.h',
- 'src/internal/cldutil_shared.cc',
- 'src/internal/cldutil_shared.h',
- 'src/internal/compact_lang_det.cc',
- 'src/internal/compact_lang_det_hint_code.cc',
- 'src/internal/compact_lang_det_hint_code.h',
- 'src/internal/compact_lang_det_impl.cc',
- 'src/internal/compact_lang_det_impl.h',
- 'src/internal/debug.cc',
- 'src/internal/debug_empty.cc',
- 'src/internal/debug.h',
- 'src/internal/fixunicodevalue.cc',
- 'src/internal/fixunicodevalue.h',
- 'src/internal/generated_distinct_bi_0.cc',
- 'src/internal/generated_entities.cc',
- 'src/internal/generated_language.cc',
- 'src/internal/generated_language.h',
- 'src/internal/generated_ulscript.cc',
- 'src/internal/generated_ulscript.h',
- 'src/internal/getonescriptspan.cc',
- 'src/internal/getonescriptspan.h',
- 'src/internal/integral_types.h',
- 'src/internal/lang_script.cc',
- 'src/internal/lang_script.h',
- 'src/internal/langspan.h',
- 'src/internal/offsetmap.cc',
- 'src/internal/offsetmap.h',
- 'src/internal/port.h',
- 'src/internal/scoreonescriptspan.cc',
- 'src/internal/scoreonescriptspan.h',
- 'src/internal/stringpiece.h',
- 'src/internal/tote.cc',
- 'src/internal/tote.h',
- 'src/internal/utf8prop_lettermarkscriptnum.h',
- 'src/internal/utf8repl_lettermarklower.h',
- 'src/internal/utf8scannot_lettermarkspecial.h',
- 'src/internal/utf8statetable.cc',
- 'src/internal/utf8statetable.h',
- 'src/public/compact_lang_det.h',
- 'src/public/encodings.h',
- ],
- },
- ],
-}