Revert 36541 (which went in without any commit log by some black magic).

Reland it with the commit log for the record.


Review URL: http://codereview.chromium.org/545123

TBR=jshin@chromium.org
Review URL: http://codereview.chromium.org/551070

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

5 files changed, 200 insertions, 166 deletions

diff --git a/third_party/cld/bar/toolbar/cld/i18n/encodings/compact_lang_det/win/cld_scopedptr.h b/third_party/cld/bar/toolbar/cld/i18n/encodings/compact_lang_det/win/cld_scopedptr.h
index 650e578..7f18238 100644
--- a/third_party/cld/bar/toolbar/cld/i18n/encodings/compact_lang_det/win/cld_scopedptr.h
+++ b/third_party/cld/bar/toolbar/cld/i18n/encodings/compact_lang_det/win/cld_scopedptr.h
@@ -5,8 +5,13 @@
 #ifndef BAR_TOOLBAR_CLD_I18N_ENCODINGS_COMPACT_LANG_DET_WIN_CLD_SCOPEDPTR_H_
 #define BAR_TOOLBAR_CLD_I18N_ENCODINGS_COMPACT_LANG_DET_WIN_CLD_SCOPEDPTR_H_
 
-// This include has to be out of order to compile common/scopedptr.h
+#include <wincrypt.h>  // to compile common/scopedptr.h
+#include <wininet.h>   // to compile common/scopedptr.h
+
+// This include has to be out of order to compile to compile common/scopedptr.h
 #include "bar/toolbar/cld/i18n/encodings/compact_lang_det/win/cld_macros.h"
+#include "bar/common/scopedlibrary.h"
+#include "bar/common/scopedptr.h"
 #include "bar/toolbar/cld/i18n/encodings/compact_lang_det/win/cld_scoped_ptr.h"
 
 #endif  // BAR_TOOLBAR_CLD_I18N_ENCODINGS_COMPACT_LANG_DET_WIN_CLD_SCOPEDPTR_H_
diff --git a/third_party/cld/bar/toolbar/cld/i18n/encodings/compact_lang_det/win/cld_unicodetext.cc b/third_party/cld/bar/toolbar/cld/i18n/encodings/compact_lang_det/win/cld_unicodetext.cc
index 5b0e67e9..c1a4d95 100644
--- a/third_party/cld/bar/toolbar/cld/i18n/encodings/compact_lang_det/win/cld_unicodetext.cc
+++ b/third_party/cld/bar/toolbar/cld/i18n/encodings/compact_lang_det/win/cld_unicodetext.cc
@@ -4,46 +4,94 @@
 
 #include "bar/toolbar/cld/i18n/encodings/compact_lang_det/win/cld_unicodetext.h"
 
-#include <string>
+#include <tchar.h>
+#include <windows.h>
+
 #include <vector>  // to compile bar/common/component.h
 
 #include "bar/toolbar/cld/i18n/encodings/compact_lang_det/compact_lang_det.h"
-#include "base/string_util.h"
-#include "unicode/normlzr.h"
-#include "unicode/unistr.h"
-#include "unicode/ustring.h"
-
-std::string NormalizeText(const UChar* text) {
-  // To avoid a copy, use the read-only aliasing ctor.
-  icu::UnicodeString source(1, text, -1);
-  icu::UnicodeString normalized;
-  UErrorCode status = U_ZERO_ERROR;
-  icu::Normalizer::normalize(source, UNORM_NFC, 0, normalized, status);
-  if (U_FAILURE(status))
-    return std::string();
-  normalized.toLower();
-  std::string utf8;
-  // Internally, toUTF8String uses a 1kB stack buffer (which is not large enough
-  // for most web pages) and does pre-flighting followed by malloc for larger
-  // strings. We have to switch to obtaining the buffer with the maximum size
-  // (UTF-16 length * 3) without pre-flighting if necessary.
-  return normalized.toUTF8String(utf8);
-}
+#include "bar/toolbar/cld/i18n/encodings/compact_lang_det/win/cld_scopedptr.h"
+#include "bar/toolbar/cld/i18n/encodings/compact_lang_det/win/normalizedunicodetext.h"
 
 
 // Detects a language of the UTF-16 encoded zero-terminated text.
 // Returns: Language enum.
 Language DetectLanguageOfUnicodeText(
     const CompactLangDet::DetectionTables* detection_tables,
-    const UChar* text, bool is_plain_text,
+    const WCHAR* text, bool is_plain_text,
     bool* is_reliable, int* num_languages,
-    int* error_code) {
-  if (!text || !num_languages)
+    DWORD* error_code) {
+  if (!text || !num_languages) {
+    if (error_code)
+      *error_code = ERROR_INVALID_PARAMETER;
+    return NUM_LANGUAGES;
+  }
+
+  // Normalize text first.  We do not check the return value here since there
+  // is no meaningful recovery we can do in case of failure anyway.
+  // Since the vast majority of texts on the Internet is already normalized
+  // and languages which require normalization are easy to recognize by CLD
+  // anyway, we'll benefit more from trying to detect language in non-normalized
+  // text (and, with some probability, fail to recognize it) than to give up
+  // right away and return the unknown language here.
+  NormalizedUnicodeText nomalized_text;
+  nomalized_text.Normalize(NormalizationC, text);
+
+  // Determine the size of the buffer required to store a lowercased text.
+  int lowercase_text_size =
+      ::LCMapString(NULL, LCMAP_LOWERCASE | LCMAP_LINGUISTIC_CASING,
+                    nomalized_text.get(), -1,
+                    NULL, 0);
+  if (!lowercase_text_size) {
+    if (error_code)
+      *error_code = ::GetLastError();
     return NUM_LANGUAGES;
-  // Normalize text to NFC, lowercase and convert to UTF-8.
-  std::string utf8_encoded = NormalizeText(text);
-  if (utf8_encoded.empty())
+  }
+
+  scoped_array<WCHAR> lowercase_text(new WCHAR[lowercase_text_size]);
+  if (!lowercase_text.get())
+    return NUM_LANGUAGES;
+
+  // Covert text to lowercase.
+  int lowercasing_result =
+      ::LCMapString(NULL, LCMAP_LOWERCASE | LCMAP_LINGUISTIC_CASING,
+                    nomalized_text.get(), -1,
+                    lowercase_text.get(), lowercase_text_size);
+  if (!lowercasing_result) {
+    if (error_code)
+      *error_code = ::GetLastError();
     return NUM_LANGUAGES;
+  }
+
+  // Determine the size of the buffer required to covert text to UTF-8.
+  int utf8_encoded_buffer_size =
+      ::WideCharToMultiByte(CP_UTF8, 0,
+                            lowercase_text.get(), -1,
+                            NULL, 0,
+                            NULL, NULL);
+  if (!utf8_encoded_buffer_size) {
+    if (error_code)
+      *error_code = ::GetLastError();
+    return NUM_LANGUAGES;
+  }
+
+  scoped_array<char> utf8_encoded_buffer(
+      new char[utf8_encoded_buffer_size]);
+
+  // Convert text to UTF-8.
+  int utf8_encoding_result =
+      ::WideCharToMultiByte(CP_UTF8, 0,
+                            lowercase_text.get(), -1,
+                            utf8_encoded_buffer.get(), utf8_encoded_buffer_size,
+                            NULL, NULL);
+  if (!utf8_encoding_result) {
+    if (error_code)
+      *error_code = ::GetLastError();
+    return NUM_LANGUAGES;
+  }
+
+  if (error_code)
+    *error_code = 0;
 
   // Engage core CLD library language detection.
   Language language3[3] = {
@@ -59,8 +107,8 @@ Language DetectLanguageOfUnicodeText(
   // language3 array is always set according to the detection results and
   // is not affected by this heuristic.
   CompactLangDet::DetectLanguageSummary(detection_tables,
-                                        utf8_encoded.c_str(),
-                                        utf8_encoded.length(),
+                                        utf8_encoded_buffer.get(),
+                                        utf8_encoded_buffer_size,
                                         is_plain_text, language3, percent3,
                                         &text_bytes, is_reliable);
 
diff --git a/third_party/cld/bar/toolbar/cld/i18n/encodings/compact_lang_det/win/cld_unicodetext.h b/third_party/cld/bar/toolbar/cld/i18n/encodings/compact_lang_det/win/cld_unicodetext.h
index c0d64aa..7030691 100644
--- a/third_party/cld/bar/toolbar/cld/i18n/encodings/compact_lang_det/win/cld_unicodetext.h
+++ b/third_party/cld/bar/toolbar/cld/i18n/encodings/compact_lang_det/win/cld_unicodetext.h
@@ -5,8 +5,9 @@
 #ifndef BAR_TOOLBAR_CLD_I18N_ENCODINGS_COMPACT_LANG_DET_WIN_CLD_UNICODETEXT_H_
 #define BAR_TOOLBAR_CLD_I18N_ENCODINGS_COMPACT_LANG_DET_WIN_CLD_UNICODETEXT_H_
 
+#include <windows.h>
+
 #include "bar/toolbar/cld/i18n/languages/public/languages.h"
-#include "unicode/utypes.h"
 
 namespace CompactLangDet {
   struct DetectionTables;
@@ -32,9 +33,9 @@ namespace CompactLangDet {
 //     for details.
 Language DetectLanguageOfUnicodeText(
     const CompactLangDet::DetectionTables* detection_tables,
-    const UChar* text, bool is_plain_text,
+    const WCHAR* text, bool is_plain_text,
     bool* is_reliable, int* num_languages,
-    int* error_code);
+    DWORD* error_code);
 
 
 #endif  // BAR_TOOLBAR_CLD_I18N_ENCODINGS_COMPACT_LANG_DET_WIN_CLD_UNICODETEXT_H_
diff --git a/third_party/cld/base/string_util.h b/third_party/cld/base/string_util.h
index 7717e5b..365d1bf 100644
--- a/third_party/cld/base/string_util.h
+++ b/third_party/cld/base/string_util.h
@@ -11,18 +11,12 @@
 

 namespace base {

 

-#ifdef WIN32

 // Compare the two strings s1 and s2 without regard to case using

 // the current locale; returns 0 if they are equal, 1 if s1 > s2, and -1 if

 // s2 > s1 according to a lexicographic comparison.

 inline int strcasecmp(const char* s1, const char* s2) {

   return _stricmp(s1, s2);

 }

-#else

-inline int strcasecmp(const char* s1, const char* s2) {

-  return strcasecmp(s1, s2);

-}

-#endif

 

 }

 

diff --git a/third_party/cld/cld.gyp b/third_party/cld/cld.gyp
index 6913f2e..2f3f192 100644
--- a/third_party/cld/cld.gyp
+++ b/third_party/cld/cld.gyp
@@ -3,133 +3,119 @@
 # found in the LICENSE file.
 
 {
-  'targets': [
-    {
-      'target_name': 'cld',
-      'type': '<(library)',
-      'dependencies': [
-	'../icu/icu.gyp:icuuc',
-      ],
-      'include_dirs': [
-        '.',
-      ],
-      'defines': [
-        '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',
-        'bar/toolbar/cld/i18n/encodings/compact_lang_det/generated/compact_lang_det_generated_quads_128.cc',
-        # For now using the 128 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_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',
-        'base/basictypes.h',
-        'base/build_config.h',
-        'base/casts.h',
-        'base/commandlineflags.h',
-        'base/global_strip_options.h',
-        'base/logging.h',
-        'base/macros.h',
-        'base/port.h',
-        'base/crash.h',
-        'base/dynamic_annotations.h',
-        'base/scoped_ptr.h',
-        'base/stl_decl_msvc.h',
-        'base/log_severity.h',
-        'base/strtoint.h',
-        'base/vlog_is_on.h',
-        'base/string_util.h',
-        'base/type_traits.h',
-        'base/template_util.h',
-      ],
-      'direct_dependent_settings': {
-        'defines': [
-          'CLD_WINDOWS',
-        ],
+  'conditions': [
+    ['OS=="win"', {
+      'targets': [
+        {
+          'target_name': 'cld',
+          'type': '<(library)',
+          'include_dirs': [
+            '.',
+          ],
+          'msvs_disabled_warnings': [4005, 4006, 4018, 4244, 4309, 4800],
+          'defines': [
+            'CLD_WINDOWS',
+          ],
+          'sources': [
+            'bar/common/scopedlibrary.h',
+            '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',
+            'bar/toolbar/cld/i18n/encodings/compact_lang_det/generated/compact_lang_det_generated_quads_128.cc',
+            # For now using the 128 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_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',
+            '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/compact_lang_det/win/normalizedunicodetext.cc',
+            'bar/toolbar/cld/i18n/encodings/compact_lang_det/win/normalizedunicodetext.h',
+            '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',
+            'base/basictypes.h',
+            'base/build_config.h',
+            'base/casts.h',
+            'base/commandlineflags.h',
+            'base/global_strip_options.h',
+            'base/logging.h',
+            'base/macros.h',
+            'base/port.h',
+            'base/crash.h',
+            'base/dynamic_annotations.h',
+            'base/scoped_ptr.h',
+            'base/stl_decl_msvc.h',
+            'base/log_severity.h',
+            'base/strtoint.h',
+            'base/vlog_is_on.h',
+            'base/string_util.h',
+            'base/type_traits.h',
+            'base/template_util.h',
+          ],
+          'direct_dependent_settings': {
+            'defines': [
+              'CLD_WINDOWS',
+              'COMPILER_MSVC',
+            ],
+          },
+        },],
       },
-      'conditions': [
-        ['OS=="win"', {
-              'direct_dependent_settings': {
-                'defines': [
-                  'COMPILER_MSVC',
-                ],
-              },
-              'msvs_disabled_warnings': [4005, 4006, 4018, 4244, 4309, 4800],
-            },
-        ],
-        ['OS!="win"', {
-              'direct_dependent_settings': {
-                'defines': [
-                  'COMPILER_GCC',
-                ],
-              },
-            },
-        ],
-      ],
-    },
+    ],
   ],
 }