Clean up third_party/cld.

1. Remove files we don't use that come from toolbar
2. Simplify the directory structure by removing the redundant
intermediary directories bar/toolbar/cld/i18n

This will bring CLD a step closer to where it can be open-sourced separately (or along with CED for encoding detection.). It's not there yet.


In addition to the clean-up, change |LanguageCode*| return 
'nb', 'he', 'fil' instead of 'no', 'iw', and 'tl'. 

Also, use LanguageCodeWithDialects instead of LanguageCode to get 'zh-CN' 
instead of 'zh'. This is to simplify the 3-way mapping between 
Chrome's UI locale code, CLD's language code and what's accepted by 
Google Translate. It's also another preparation for open-sourcing because
we'd better use the standard code rather than the obsolete code like 'iw'
when open-sourcing.

BUG=32759, 33613
TEST=third_party/cld builds on all platforms and pass the following tests:
- unit_tests: Extension*.DetectTabLanguage and CompactLangDetTest.* 
- browser_tests: ExtensionBrowserTest.Toolstrip


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38146 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 52 insertions, 70 deletions

diff --git a/third_party/cld/cld.gyp b/third_party/cld/cld.gyp
index 91a9588..ce6db41 100644
--- a/third_party/cld/cld.gyp
+++ b/third_party/cld/cld.gyp
@@ -8,7 +8,7 @@
       'target_name': 'cld',
       'type': '<(library)',
       'dependencies': [
-	'../icu/icu.gyp:icuuc',
+      	'../icu/icu.gyp:icuuc',
       ],
       'include_dirs': [
         '.',
@@ -17,76 +17,58 @@
         'CLD_WINDOWS',
       ],
       'sources': [
-        'bar/common/scopedptr.h',
-        'bar/toolbar/cld/i18n/encodings/compact_lang_det/cldutil.cc',
-        'bar/toolbar/cld/i18n/encodings/compact_lang_det/cldutil.h',
-        'bar/toolbar/cld/i18n/encodings/compact_lang_det/cldutil_dbg.h',
-        'bar/toolbar/cld/i18n/encodings/compact_lang_det/cldutil_dbg_empty.cc',
-        'bar/toolbar/cld/i18n/encodings/compact_lang_det/compact_lang_det.cc',
-        'bar/toolbar/cld/i18n/encodings/compact_lang_det/compact_lang_det.h',
-        'bar/toolbar/cld/i18n/encodings/compact_lang_det/compact_lang_det_impl.cc',
-        'bar/toolbar/cld/i18n/encodings/compact_lang_det/compact_lang_det_impl.h',
-        'bar/toolbar/cld/i18n/encodings/compact_lang_det/ext_lang_enc.cc',
-        'bar/toolbar/cld/i18n/encodings/compact_lang_det/ext_lang_enc.h',
-        'bar/toolbar/cld/i18n/encodings/compact_lang_det/getonescriptspan.cc',
-        'bar/toolbar/cld/i18n/encodings/compact_lang_det/getonescriptspan.h',
-        'bar/toolbar/cld/i18n/encodings/compact_lang_det/letterscript_enum.cc',
-        'bar/toolbar/cld/i18n/encodings/compact_lang_det/letterscript_enum.h',
-        'bar/toolbar/cld/i18n/encodings/compact_lang_det/subsetsequence.cc',
-        'bar/toolbar/cld/i18n/encodings/compact_lang_det/subsetsequence.h',
-        'bar/toolbar/cld/i18n/encodings/compact_lang_det/tote.cc',
-        'bar/toolbar/cld/i18n/encodings/compact_lang_det/tote.h',
-        'bar/toolbar/cld/i18n/encodings/compact_lang_det/utf8propjustletter.h',
-        'bar/toolbar/cld/i18n/encodings/compact_lang_det/utf8propletterscriptnum.h',
-        'bar/toolbar/cld/i18n/encodings/compact_lang_det/utf8scannotjustletterspecial.h',
-        'bar/toolbar/cld/i18n/encodings/compact_lang_det/generated/compact_lang_det_generated_cjkbis_0.cc',
-        'bar/toolbar/cld/i18n/encodings/compact_lang_det/generated/compact_lang_det_generated_ctjkvz.cc',
-        'bar/toolbar/cld/i18n/encodings/compact_lang_det/generated/compact_lang_det_generated_longwords8_0.cc',
-        'bar/toolbar/cld/i18n/encodings/compact_lang_det/generated/compact_lang_det_generated_meanscore.h',
+        'encodings/compact_lang_det/cldutil.cc',
+        'encodings/compact_lang_det/cldutil.h',
+        'encodings/compact_lang_det/cldutil_dbg.h',
+        'encodings/compact_lang_det/cldutil_dbg_empty.cc',
+        'encodings/compact_lang_det/compact_lang_det.cc',
+        'encodings/compact_lang_det/compact_lang_det.h',
+        'encodings/compact_lang_det/compact_lang_det_impl.cc',
+        'encodings/compact_lang_det/compact_lang_det_impl.h',
+        'encodings/compact_lang_det/ext_lang_enc.cc',
+        'encodings/compact_lang_det/ext_lang_enc.h',
+        'encodings/compact_lang_det/getonescriptspan.cc',
+        'encodings/compact_lang_det/getonescriptspan.h',
+        'encodings/compact_lang_det/letterscript_enum.cc',
+        'encodings/compact_lang_det/letterscript_enum.h',
+        'encodings/compact_lang_det/subsetsequence.cc',
+        'encodings/compact_lang_det/subsetsequence.h',
+        'encodings/compact_lang_det/tote.cc',
+        'encodings/compact_lang_det/tote.h',
+        'encodings/compact_lang_det/utf8propjustletter.h',
+        'encodings/compact_lang_det/utf8propletterscriptnum.h',
+        'encodings/compact_lang_det/utf8scannotjustletterspecial.h',
+        'encodings/compact_lang_det/generated/compact_lang_det_generated_cjkbis_0.cc',
+        'encodings/compact_lang_det/generated/compact_lang_det_generated_ctjkvz.cc',
+        'encodings/compact_lang_det/generated/compact_lang_det_generated_longwords8_0.cc',
+        'encodings/compact_lang_det/generated/compact_lang_det_generated_meanscore.h',
         # For now using the compact 34 bytes detection in order to save hundreds of KBs on the final package.
-        'bar/toolbar/cld/i18n/encodings/compact_lang_det/generated/compact_lang_det_generated_quads_34rr.cc',
-        #'bar/toolbar/cld/i18n/encodings/compact_lang_det/generated/compact_lang_det_generated_quads_128.cc',
-        #'bar/toolbar/cld/i18n/encodings/compact_lang_det/generated/compact_lang_det_generated_quads_256.cc',
-        'bar/toolbar/cld/i18n/encodings/compact_lang_det/win/cld_basictypes.h',
-        'bar/toolbar/cld/i18n/encodings/compact_lang_det/win/cld_commandlineflags.h',
-        # We use the static table at this point, so we don't need to compile the following files:
-        #'bar/toolbar/cld/i18n/encodings/compact_lang_det/win/cld_dynamicstate.h',
-        #'bar/toolbar/cld/i18n/encodings/compact_lang_det/win/cld_dynamicstate.cc',
-        #'bar/toolbar/cld/i18n/encodings/compact_lang_det/win/cld_loadpolicy.cc',
-        #'bar/toolbar/cld/i18n/encodings/compact_lang_det/win/cld_loadpolicy.h',
-        #'bar/toolbar/cld/i18n/encodings/compact_lang_det/win/cld_loadpolicyinterface.h',
-        #'bar/toolbar/cld/i18n/encodings/compact_lang_det/win/cld_resourceids.h',
-        #'bar/toolbar/cld/i18n/encodings/compact_lang_det/win/cld_service.h',
-        #'bar/toolbar/cld/i18n/encodings/compact_lang_det/win/cld_service.cc',
-        #'bar/toolbar/cld/i18n/encodings/compact_lang_det/win/cld_serviceinterface.h',
-        #'bar/toolbar/cld/i18n/encodings/compact_lang_det/win/cld_tables.cc',
-        #'bar/toolbar/cld/i18n/encodings/compact_lang_det/win/cld_tables.h',
-        #'bar/toolbar/cld/i18n/encodings/compact_lang_det/win/resourceinmemory.cc',
-        #'bar/toolbar/cld/i18n/encodings/compact_lang_det/win/resourceinmemory.h',
-        'bar/toolbar/cld/i18n/encodings/compact_lang_det/win/cld_google.h',
-        'bar/toolbar/cld/i18n/encodings/compact_lang_det/win/cld_htmlutils.h',
-        'bar/toolbar/cld/i18n/encodings/compact_lang_det/win/cld_htmlutils_windows.cc',
-        'bar/toolbar/cld/i18n/encodings/compact_lang_det/win/cld_logging.h',
-        'bar/toolbar/cld/i18n/encodings/compact_lang_det/win/cld_macros.h',
-        # None of files we build require these two headers.
-        #'bar/toolbar/cld/i18n/encodings/compact_lang_det/win/cld_scoped_ptr.h',
-        #'bar/toolbar/cld/i18n/encodings/compact_lang_det/win/cld_scopedptr.h',
-        'bar/toolbar/cld/i18n/encodings/compact_lang_det/win/cld_strtoint.h',
-        'bar/toolbar/cld/i18n/encodings/compact_lang_det/win/cld_unicodetext.cc',
-        'bar/toolbar/cld/i18n/encodings/compact_lang_det/win/cld_unicodetext.h',
-        'bar/toolbar/cld/i18n/encodings/compact_lang_det/win/cld_unilib.h',
-        'bar/toolbar/cld/i18n/encodings/compact_lang_det/win/cld_unilib_windows.cc',
-        'bar/toolbar/cld/i18n/encodings/compact_lang_det/win/cld_utf.h',
-        'bar/toolbar/cld/i18n/encodings/compact_lang_det/win/cld_utf8statetable.cc',
-        'bar/toolbar/cld/i18n/encodings/compact_lang_det/win/cld_utf8statetable.h',
-        'bar/toolbar/cld/i18n/encodings/compact_lang_det/win/cld_utf8utils.h',
-        'bar/toolbar/cld/i18n/encodings/compact_lang_det/win/cld_utf8utils_windows.cc',
-        'bar/toolbar/cld/i18n/encodings/internal/encodings.cc',
-        'bar/toolbar/cld/i18n/encodings/proto/encodings.pb.h',
-        'bar/toolbar/cld/i18n/encodings/public/encodings.h',
-        'bar/toolbar/cld/i18n/languages/internal/languages.cc',
-        'bar/toolbar/cld/i18n/languages/proto/languages.pb.h',
-        'bar/toolbar/cld/i18n/languages/public/languages.h',
+        'encodings/compact_lang_det/generated/compact_lang_det_generated_quads_34rr.cc',
+        # 'encodings/compact_lang_det/generated/compact_lang_det_generated_quads_128.cc',
+        # 'encodings/compact_lang_det/generated/compact_lang_det_generated_quads_256.cc',
+        'encodings/compact_lang_det/win/cld_basictypes.h',
+        'encodings/compact_lang_det/win/cld_commandlineflags.h',
+        'encodings/compact_lang_det/win/cld_google.h',
+        'encodings/compact_lang_det/win/cld_htmlutils.h',
+        'encodings/compact_lang_det/win/cld_htmlutils_windows.cc',
+        'encodings/compact_lang_det/win/cld_logging.h',
+        'encodings/compact_lang_det/win/cld_macros.h',
+        'encodings/compact_lang_det/win/cld_strtoint.h',
+        'encodings/compact_lang_det/win/cld_unicodetext.cc',
+        'encodings/compact_lang_det/win/cld_unicodetext.h',
+        'encodings/compact_lang_det/win/cld_unilib.h',
+        'encodings/compact_lang_det/win/cld_unilib_windows.cc',
+        'encodings/compact_lang_det/win/cld_utf.h',
+        'encodings/compact_lang_det/win/cld_utf8statetable.cc',
+        'encodings/compact_lang_det/win/cld_utf8statetable.h',
+        'encodings/compact_lang_det/win/cld_utf8utils.h',
+        'encodings/compact_lang_det/win/cld_utf8utils_windows.cc',
+        'encodings/internal/encodings.cc',
+        'encodings/proto/encodings.pb.h',
+        'encodings/public/encodings.h',
+        'languages/internal/languages.cc',
+        'languages/proto/languages.pb.h',
+        'languages/public/languages.h',
         'base/basictypes.h',
         'base/build_config.h',
         'base/casts.h',