Fix SysStrings unit test failure on Chromecast

base/base.gypi

Index: base/base.gypi
diff --git a/base/base.gypi b/base/base.gypi
index 0f8fff25736cac34b94541c18e8fb0594a357226..20d5e81950ed84d64808db098f0db7bf550de4b6 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -1007,11 +1007,6 @@
           ['OS == "win" and >(nacl_untrusted_build)==1', {
               'sources/': [ ['exclude', '\\.h$'] ],
           }],
-          # Enable more direct string conversions on platforms with native utf8
-          # strings
-          ['OS=="mac" or OS=="ios" or <(chromeos)==1 or <(chromecast)==1', {
-            'defines': ['SYSTEM_NATIVE_UTF8'],
-          }],
         ],
       }],
       ['base_i18n_target==1', {
@@ -1055,7 +1050,12 @@
           'i18n/utf8_validator_tables.cc',
           'i18n/utf8_validator_tables.h',
         ],
-      }]
+      }],
+      # Enable more direct string conversions on platforms with native utf8

[Lei Zhang, 2015/03/09 22:33:35]

Can we revert the change to this file, and instead add the define to
base_unittests in base/base.gyp? So the gyp and gn changes are a closer match.

[halliwell, 2015/03/09 22:50:21]

Done.

+      # strings
+      ['OS=="mac" or OS=="ios" or <(chromeos)==1 or <(chromecast)==1', {
+        'defines': ['SYSTEM_NATIVE_UTF8'],
+      }],
     ],
   },
 }