Chromium roll (https://codereview.chromium.org/976353002)

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 24 matching lines @@
         'prefs/writeable_pref_store.h',
       ],
       'includes': [
         '../build/android/increase_size_for_speed.gypi',
       ],
     },
     {
       # TODO(pasko): Remove this target when crbug.com/424562 is fixed.
       # GN: //base:protect_file_posix
       'target_name': 'protect_file_posix',
-      'type': 'static_library',
-      'dependencies': [
-        'base',
-      ],
-      'sources': [
-        'files/protect_file_posix.cc',
+      'conditions': [
+        ['os_posix == 1', {
+          'type': 'static_library',
+          'dependencies': [
+            'base',
+          ],
+          'sources': [
+            'files/protect_file_posix.cc',
+          ],
+        }, {
+          'type': 'none',
+        }],
       ],
     },
     {
       'target_name': 'base_prefs_test_support',
       'type': 'static_library',
       'dependencies': [
         'base',
         'base_prefs',
         '../testing/gmock.gyp:gmock',
       ],
@@ skipping 370 matching lines @@
             ],
           },
         ],
         ['OS == "win"', {
           'sources!': [
             'file_descriptor_shuffle_unittest.cc',
             'files/dir_reader_posix_unittest.cc',
             'message_loop/message_pump_libevent_unittest.cc',
             'threading/worker_pool_posix_unittest.cc',
           ],
-          'dependencies': [
-            'pe_image_test',
-          ],
           # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
           'msvs_disabled_warnings': [
             4267,
           ],
           'conditions': [
             # This is needed so base_unittests uses the allocator shim, as
             # SecurityTest.MemoryAllocationRestriction* tests are dependent
             # on tcmalloc.
             # TODO(wfh): crbug.com/246278 Move tcmalloc specific tests into
             # their own test suite.
@@ skipping 140 matching lines @@
         'test/launcher/test_result.h',
         'test/launcher/test_results_tracker.cc',
         'test/launcher/test_results_tracker.h',
         'test/launcher/unit_test_launcher.cc',
         'test/launcher/unit_test_launcher.h',
         'test/launcher/unit_test_launcher_ios.cc',
         'test/mock_chrome_application_mac.h',
         'test/mock_chrome_application_mac.mm',
         'test/mock_devices_changed_observer.cc',
         'test/mock_devices_changed_observer.h',
+        'test/mock_log.cc',
+        'test/mock_log.h',
         'test/multiprocess_test.cc',
         'test/multiprocess_test.h',
         'test/multiprocess_test_android.cc',
         'test/null_task_runner.cc',
         'test/null_task_runner.h',
         'test/opaque_ref_counted.cc',
         'test/opaque_ref_counted.h',
         'test/perf_log.cc',
         'test/perf_log.h',
         'test/perf_test_suite.cc',
@@ skipping 375 matching lines @@
       ],
     }],
     ['OS == "android"', {
       'targets': [
         {
           # GN: //base:base_jni_headers
           'target_name': 'base_jni_headers',
           'type': 'none',
           'sources': [
             'android/java/src/org/chromium/base/ApplicationStatus.java',
+            'android/java/src/org/chromium/base/AnimationFrameTimeHistogram.java',
             'android/java/src/org/chromium/base/BuildInfo.java',
             'android/java/src/org/chromium/base/CommandLine.java',
             'android/java/src/org/chromium/base/ContentUriUtils.java',
             'android/java/src/org/chromium/base/CpuFeatures.java',
             'android/java/src/org/chromium/base/EventLog.java',
             'android/java/src/org/chromium/base/FieldTrialList.java',
             'android/java/src/org/chromium/base/ImportantFileWriterAndroid.java',
             'android/java/src/org/chromium/base/JNIUtils.java',
             'android/java/src/org/chromium/base/JavaHandlerThread.java',
             'android/java/src/org/chromium/base/LocaleUtils.java',
@@ skipping 195 matching lines @@
           'sources': [
             'debug_message.cc',
           ],
           'msvs_settings': {
             'VCLinkerTool': {
               'SubSystem': '2',         # Set /SUBSYSTEM:WINDOWS
             },
           },
         },
         {
+          # Target to manually rebuild pe_image_test.dll which is checked into
+          # base/test/data/pe_image.
           'target_name': 'pe_image_test',
           'type': 'shared_library',
           'sources': [
             'win/pe_image_test.cc',
           ],
           'msvs_settings': {
             'VCLinkerTool': {
               'SubSystem': '2',         # Set /SUBSYSTEM:WINDOWS
               'DelayLoadDLLs': [
                 'cfgmgr32.dll',
@@ skipping 27 matching lines @@
               'dependencies': [
                 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }