Refactor language detection logic to allow non-static CLD data sources.

chrome/browser/resources/chromeos/chromevox/chromevox_tests.gypi

Index: chrome/browser/resources/chromeos/chromevox/chromevox_tests.gypi
diff --git a/chrome/browser/resources/chromeos/chromevox/chromevox_tests.gypi b/chrome/browser/resources/chromeos/chromevox/chromevox_tests.gypi
index e9c9f615b24cc6462704c42b64a1c4e33e6c0cf0..7323e671306c28fe65aa4eb731287025ca451449 100644
--- a/chrome/browser/resources/chromeos/chromevox/chromevox_tests.gypi
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox_tests.gypi
@@ -30,6 +30,14 @@
         '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
         'chromevox_test_deps_js',
       ],
+      'conditions': [
+        [ 'cld_version==2', {

[picksi1, 2014/10/30 17:37:32]

Earlier in the code there's code that checks for 0 or 2 (e.g.)

 if (cld_version == 0 || cld_version == 2)

Do these 2 checks need to be 'harmonized' or are they different things?
    

[Andrew Hayden (chromium.org), 2014/10/30 17:51:13]

It should all be 0 or 2, for consistency. As soon as we get Android onto CLD2,
we can get rid of CLD1 along with all of these checks, so it's a minor problem.
This builds and runs on all platforms acceptably. But yes... I will change it
for consistency.... good catch.

[Andrew Hayden (chromium.org), 2014/10/31 11:38:06]

Done everywhere.

+          'dependencies': [
+            # Interactive tests should use whatever CLD2 data access mode that
+            # the application embedder is using.
+            '../../../../../third_party/cld_2/cld_2.gyp:cld2_platform_impl', ],
+        }],

[picksi1, 2014/10/30 17:37:32]

Is a relative path here OK? Other paths seem to have absolute paths.

[Andrew Hayden (chromium.org), 2014/10/30 17:51:13]

Also a good catch, this should be using (DEPTH) just like the ones above.
Thanks.

[Andrew Hayden (chromium.org), 2014/10/31 11:38:06]

Done everywhere.

+      ],
       'defines': [
         'HAS_OUT_OF_PROC_TEST_RUNNER',
       ],