Update from https://crrev.com/320343

base/base.gyp

 # 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'includes': [
     '../build/win_precompile.gypi',
@@ skipping 320 matching lines @@
         'base',
       ],
       'export_dependent_settings': [
         'base',
       ],
       'defines': [
         'BASE_PREFS_IMPLEMENTATION',
       ],
       'sources': [
         'prefs/base_prefs_export.h',
-        'prefs/base_prefs_switches.cc',
-        'prefs/base_prefs_switches.h',
         'prefs/default_pref_store.cc',
         'prefs/default_pref_store.h',
         'prefs/json_pref_store.cc',
         'prefs/json_pref_store.h',
         'prefs/overlay_user_pref_store.cc',
         'prefs/overlay_user_pref_store.h',
         'prefs/persistent_pref_store.h',
         'prefs/pref_change_registrar.cc',
         'prefs/pref_change_registrar.h',
         'prefs/pref_filter.h',
@@ skipping 183 matching lines @@
         'mac/bind_objc_block_unittest.mm',
         'mac/foundation_util_unittest.mm',
         'mac/libdispatch_task_runner_unittest.cc',
         'mac/mac_util_unittest.mm',
         'mac/objc_property_releaser_unittest.mm',
         'mac/scoped_nsobject_unittest.mm',
         'mac/scoped_objc_class_swizzler_unittest.mm',
         'mac/scoped_sending_event_unittest.mm',
         'md5_unittest.cc',
         'memory/aligned_memory_unittest.cc',
-        'memory/discardable_memory_manager_unittest.cc',
         'memory/discardable_memory_unittest.cc',
         'memory/discardable_shared_memory_unittest.cc',
         'memory/linked_ptr_unittest.cc',
         'memory/ref_counted_memory_unittest.cc',
         'memory/ref_counted_unittest.cc',
         'memory/scoped_ptr_unittest.cc',
         'memory/scoped_ptr_unittest.nc',
         'memory/scoped_vector_unittest.cc',
         'memory/shared_memory_unittest.cc',
         'memory/singleton_unittest.cc',
@@ skipping 271 matching lines @@
           'sources/': [
             # Pull in specific Mac files for iOS (which have been filtered out
             # by file name rules).
             ['include', '^mac/bind_objc_block_unittest\\.mm$'],
             ['include', '^mac/foundation_util_unittest\\.mm$',],
             ['include', '^mac/objc_property_releaser_unittest\\.mm$'],
             ['include', '^mac/scoped_nsobject_unittest\\.mm$'],
             ['include', '^sys_string_conversions_mac_unittest\\.mm$'],
           ],
         }],
-        ['OS == "android" and _toolset == "target"', {
-          'sources': [
-            'memory/discardable_memory_ashmem_allocator_unittest.cc',
-          ],
-        }],
         ['OS == "android"', {
           'sources/': [
             ['include', '^debug/proc_maps_linux_unittest\\.cc$'],
           ],
         }],
+        # 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'],
+        }],
       ],  # target_conditions
     },
     {
+      # GN: //base:base_perftests
       'target_name': 'base_perftests',
       'type': '<(gtest_target_type)',
       'dependencies': [
         'base',
         'test_support_base',
         '../testing/gtest.gyp:gtest',
       ],
       'sources': [
         'message_loop/message_pump_perftest.cc',
         'test/run_all_unittests.cc',
         'threading/thread_perftest.cc',
         '../testing/perf/perf_test.cc'
       ],
       'conditions': [
         ['OS == "android"', {
           'dependencies': [
             '../testing/android/native_test.gyp:native_test_native_code',
           ],
         }],
       ],
     },
     {
+      # GN: //base:base_i18n_perftests
       'target_name': 'base_i18n_perftests',
       'type': '<(gtest_target_type)',
       'dependencies': [
         'test_support_base',
         'test_support_perf',
         '../testing/gtest.gyp:gtest',
         'base_i18n',
         'base',
       ],
       'sources': [
@@ skipping 187 matching lines @@
           ],
           'sources': [
             'test/launcher/test_launcher_ios.cc',
           ],
         },
       ],
     }],
     ['OS!="ios"', {
       'targets': [
         {
+          # GN: //base:check_example
           'target_name': 'check_example',
           'type': 'executable',
           'sources': [
             'check_example.cc',
           ],
           'dependencies': [
             'base',
           ],
         },
         {
@@ skipping 511 matching lines @@
               'dependencies': [
                 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }