Update from https://crrev.com/308331

base/base.gypi

 # Copyright (c) 2012 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.
 
 {
   'target_defaults': {
     'variables': {
       'base_target': 0,
       'base_i18n_target': 0,
     },
@@ skipping 104 matching lines @@
           'bits.h',
           'build_time.cc',
           'build_time.h',
           'callback.h',
           'callback_helpers.cc',
           'callback_helpers.h',
           'callback_internal.cc',
           'callback_internal.h',
           'callback_list.h',
           'cancelable_callback.h',
+          'chromeos/memory_pressure_observer_chromeos.cc',
+          'chromeos/memory_pressure_observer_chromeos.h',
           'command_line.cc',
           'command_line.h',
           'compiler_specific.h',
           'containers/adapters.h',
           'containers/hash_tables.h',
           'containers/linked_list.h',
           'containers/mru_cache.h',
           'containers/scoped_ptr_hash_map.h',
           'containers/small_map.h',
           'containers/stack_container.h',
@@ skipping 109 matching lines @@
           'hash.cc',
           'hash.h',
           'id_map.h',
           'ios/block_types.h',
           'ios/device_util.h',
           'ios/device_util.mm',
           'ios/ios_util.h',
           'ios/ios_util.mm',
           'ios/scoped_critical_action.h',
           'ios/scoped_critical_action.mm',
+          'ios/weak_nsobject.h',
+          'ios/weak_nsobject.mm',
           'json/json_file_value_serializer.cc',
           'json/json_file_value_serializer.h',
           'json/json_parser.cc',
           'json/json_parser.h',
           'json/json_reader.cc',
           'json/json_reader.h',
           'json/json_string_value_serializer.cc',
           'json/json_string_value_serializer.h',
           'json/json_value_converter.h',
           'json/json_writer.cc',
@@ skipping 708 matching lines @@
               ['exclude', '^files/file_util_linux\\.cc$'],
               ['exclude', '^process/process_linux\\.cc$'],
               ['exclude', '^sys_info_linux\\.cc$'],
             ],
           }],
           # Remove all unnecessary files for build_nexe.py to avoid exceeding
           # command-line-string limitation when building NaCl on Windows.
           ['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', {
         'defines': [
           'BASE_I18N_IMPLEMENTATION',
         ],
         'sources': [
           'i18n/base_i18n_export.h',
           'i18n/bidi_line_iterator.cc',
           'i18n/bidi_line_iterator.h',
@@ skipping 27 matching lines @@
           'i18n/time_formatting.h',
           'i18n/timezone.cc',
           'i18n/timezone.h',
           'i18n/utf8_validator_tables.cc',
           'i18n/utf8_validator_tables.h',
         ],
       }]
     ],
   },
 }