diff --git a/ash/wm/panels/panel_window_resizer_unittest.cc b/ash/wm/panels/panel_window_resizer_unittest.cc index 21bcf6673344e7..0ce01b79d6cd4d 100644 --- a/ash/wm/panels/panel_window_resizer_unittest.cc +++ b/ash/wm/panels/panel_window_resizer_unittest.cc @@ -24,7 +24,6 @@ #include "ash/wm/window_properties.h" #include "ash/wm/window_state_aura.h" #include "base/i18n/rtl.h" -#include "base/win/windows_version.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/window_event_dispatcher.h" #include "ui/base/hit_test.h" @@ -32,6 +31,10 @@ #include "ui/views/widget/widget.h" #include "ui/wm/core/window_util.h" +#if defined(OS_WIN) +#include "base/win/windows_version.h" +#endif + namespace ash { class PanelWindowResizerTest : public test::AshTestBase { diff --git a/base/BUILD.gn b/base/BUILD.gn index 40f5713cf27d73..002a70bf9da65c 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn @@ -149,6 +149,8 @@ component("base") { "allocator/allocator_check.h", "allocator/allocator_extension.cc", "allocator/allocator_extension.h", + "allocator/allocator_shim.h", + "allocator/oom.h", "android/animation_frame_time_histogram.cc", "android/animation_frame_time_histogram.h", "android/apk_assets.cc", @@ -170,6 +172,7 @@ component("base") { "android/context_utils.cc", "android/context_utils.h", "android/cpu_features.cc", + "android/cpu_features.h", "android/cxa_demangle_stub.cc", "android/early_trace_event_binding.cc", "android/early_trace_event_binding.h", @@ -188,6 +191,8 @@ component("base") { "android/jni_android.h", "android/jni_array.cc", "android/jni_array.h", + "android/jni_generator/jni_generator_helper.h", + "android/jni_int_wrapper.h", "android/jni_registrar.cc", "android/jni_registrar.h", "android/jni_string.cc", @@ -230,6 +235,7 @@ component("base") { "atomic_ref_count.h", "atomic_sequence_num.h", "atomicops.h", + "atomicops_internals_atomicword_compat.h", "atomicops_internals_portable.h", "atomicops_internals_x86_msvc.h", "auto_reset.h", @@ -257,6 +263,7 @@ component("base") { "callback_helpers.h", "callback_internal.cc", "callback_internal.h", + "callback_list.h", "cancelable_callback.h", "command_line.cc", "command_line.h", @@ -313,6 +320,7 @@ component("base") { "deferred_sequenced_task_runner.h", "environment.cc", "environment.h", + "event_types.h", "feature_list.cc", "feature_list.h", "file_descriptor_posix.h", @@ -544,6 +552,7 @@ component("base") { "message_loop/message_pump_mac.mm", "message_loop/message_pump_win.cc", "message_loop/message_pump_win.h", + "message_loop/timer_slack.h", "metrics/bucket_ranges.cc", "metrics/bucket_ranges.h", "metrics/field_trial.cc", @@ -560,6 +569,8 @@ component("base") { "metrics/histogram_functions.cc", "metrics/histogram_functions.h", "metrics/histogram_macros.h", + "metrics/histogram_macros_internal.h", + "metrics/histogram_macros_local.h", "metrics/histogram_samples.cc", "metrics/histogram_samples.h", "metrics/histogram_snapshot_manager.cc", @@ -614,6 +625,7 @@ component("base") { "pickle.h", "posix/eintr_wrapper.h", "posix/file_descriptor_shuffle.cc", + "posix/file_descriptor_shuffle.h", "posix/global_descriptors.cc", "posix/global_descriptors.h", "posix/safe_strerror.cc", @@ -706,6 +718,7 @@ component("base") { "rand_util_win.cc", "run_loop.cc", "run_loop.h", + "scoped_clear_errno.h", "scoped_generic.h", "scoped_native_library.cc", "scoped_native_library.h", @@ -789,6 +802,7 @@ component("base") { "sys_info.h", "sys_info_android.cc", "sys_info_chromeos.cc", + "sys_info_internal.h", "syslog_logging.cc", "syslog_logging.h", @@ -846,6 +860,7 @@ component("base") { "task_scheduler/task_traits.cc", "task_scheduler/task_traits.h", "template_util.h", + "test/malloc_wrapper.h", "third_party/dmg_fp/dmg_fp.h", "third_party/dmg_fp/dtoa_wrapper.cc", "third_party/dmg_fp/g_fmt.cc", @@ -854,6 +869,7 @@ component("base") { "third_party/nspr/prtime.cc", "third_party/nspr/prtime.h", "third_party/superfasthash/superfasthash.c", + "third_party/valgrind/memcheck.h", "threading/non_thread_safe.h", "threading/non_thread_safe_impl.cc", "threading/non_thread_safe_impl.h", @@ -1366,7 +1382,10 @@ component("base") { # Desktop Mac. if (is_mac) { - sources += [ "power_monitor/power_monitor_device_source_mac.mm" ] + sources += [ + "mac/scoped_typeref.h", + "power_monitor/power_monitor_device_source_mac.mm", + ] libs = [ "ApplicationServices.framework", diff --git a/base/debug/stack_trace_posix.cc b/base/debug/stack_trace_posix.cc index 27a656e6caffe7..db999b783f22f9 100644 --- a/base/debug/stack_trace_posix.cc +++ b/base/debug/stack_trace_posix.cc @@ -33,8 +33,11 @@ #include #endif -#include "base/debug/debugger.h" +#if defined(OS_LINUX) #include "base/debug/proc_maps_linux.h" +#endif + +#include "base/debug/debugger.h" #include "base/logging.h" #include "base/macros.h" #include "base/memory/free_deleter.h" diff --git a/base/third_party/libevent/BUILD.gn b/base/third_party/libevent/BUILD.gn index 5dd0f7070e89d9..e934454a10f969 100644 --- a/base/third_party/libevent/BUILD.gn +++ b/base/third_party/libevent/BUILD.gn @@ -9,28 +9,53 @@ static_library("libevent") { "buffer.c", "evbuffer.c", "evdns.c", + "evdns.h", + "event-config.h", + "event-internal.h", "event.c", + "event.h", "event_tagging.c", + "evhttp.h", + "evrpc-internal.h", "evrpc.c", + "evrpc.h", + "evsignal.h", "evutil.c", + "evutil.h", + "http-internal.h", "http.c", "log.c", + "log.h", + "min_heap.h", "poll.c", "select.c", "signal.c", + "strlcpy-internal.h", "strlcpy.c", ] defines = [ "HAVE_CONFIG_H" ] if (is_mac || is_ios) { - sources += [ "kqueue.c" ] + sources += [ + "kqueue.c", + "mac/config.h", + "mac/event-config.h", + ] include_dirs = [ "mac" ] } else if (is_linux) { - sources += [ "epoll.c" ] + sources += [ + "epoll.c", + "linux/config.h", + "linux/event-config.h", + ] include_dirs = [ "linux" ] } else if (is_android) { - sources += [ "epoll.c" ] + sources += [ + "android/config.h", + "android/event-config.h", + "epoll.c", + ] include_dirs = [ "android" ] } else if (is_nacl_nonsfi) { sources -= [ diff --git a/chrome/browser/apps/app_url_redirector_browsertest.cc b/chrome/browser/apps/app_url_redirector_browsertest.cc index 838d257c500bd6..832bbf0bac6711 100644 --- a/chrome/browser/apps/app_url_redirector_browsertest.cc +++ b/chrome/browser/apps/app_url_redirector_browsertest.cc @@ -4,7 +4,6 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/win/windows_version.h" #include "build/build_config.h" #include "chrome/browser/apps/app_browsertest_util.h" #include "chrome/browser/chrome_notification_types.h" @@ -19,6 +18,10 @@ #include "net/test/embedded_test_server/embedded_test_server.h" #include "ui/base/page_transition_types.h" +#if defined(OS_WIN) +#include "base/win/windows_version.h" +#endif + namespace extensions { class PlatformAppUrlRedirectorBrowserTest : public PlatformAppBrowserTest { diff --git a/chrome/browser/component_updater/pnacl_component_installer.cc b/chrome/browser/component_updater/pnacl_component_installer.cc index f3b747b4261542..ed6b5b085dbead 100644 --- a/chrome/browser/component_updater/pnacl_component_installer.cc +++ b/chrome/browser/component_updater/pnacl_component_installer.cc @@ -23,7 +23,6 @@ #include "base/strings/string_util.h" #include "base/values.h" #include "base/version.h" -#include "base/win/windows_version.h" #include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/common/chrome_paths.h" @@ -33,6 +32,10 @@ #include "components/update_client/utils.h" #include "content/public/browser/browser_thread.h" +#if defined(OS_WIN) +#include "base/win/windows_version.h" +#endif + using content::BrowserThread; using update_client::CrxComponent; using update_client::UpdateQueryParams; diff --git a/chrome/browser/extensions/api/cast_streaming/performance_test.cc b/chrome/browser/extensions/api/cast_streaming/performance_test.cc index 81bf52b83ff446..b66206af9d7d54 100644 --- a/chrome/browser/extensions/api/cast_streaming/performance_test.cc +++ b/chrome/browser/extensions/api/cast_streaming/performance_test.cc @@ -13,7 +13,6 @@ #include "base/strings/stringprintf.h" #include "base/test/trace_event_analyzer.h" #include "base/time/default_tick_clock.h" -#include "base/win/windows_version.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/tab_helper.h" @@ -54,6 +53,10 @@ #include "ui/compositor/compositor_switches.h" #include "ui/gl/gl_switches.h" +#if defined(OS_WIN) +#include "base/win/windows_version.h" +#endif + namespace { const char kExtensionId[] = "ddchlicdkolnonkihahngkmmmjnjlkkf"; diff --git a/chrome/browser/extensions/api/tab_capture/tab_capture_performancetest.cc b/chrome/browser/extensions/api/tab_capture/tab_capture_performancetest.cc index 6be7404636ac7f..ab42182e4d38d0 100644 --- a/chrome/browser/extensions/api/tab_capture/tab_capture_performancetest.cc +++ b/chrome/browser/extensions/api/tab_capture/tab_capture_performancetest.cc @@ -5,7 +5,6 @@ #include "base/command_line.h" #include "base/strings/stringprintf.h" #include "base/test/trace_event_analyzer.h" -#include "base/win/windows_version.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/tab_helper.h" @@ -28,6 +27,10 @@ #include "ui/compositor/compositor_switches.h" #include "ui/gl/gl_switches.h" +#if defined(OS_WIN) +#include "base/win/windows_version.h" +#endif + namespace { const char kExtensionId[] = "ddchlicdkolnonkihahngkmmmjnjlkkf"; diff --git a/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc b/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc index 8b7a5452910c5f..924d427d576718 100644 --- a/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc +++ b/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc @@ -15,7 +15,6 @@ #include "base/synchronization/waitable_event.h" #include "base/threading/platform_thread.h" #include "base/time/time.h" -#include "base/win/windows_version.h" #include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.h" @@ -40,6 +39,10 @@ #include "net/test/embedded_test_server/embedded_test_server.h" #include "testing/gtest/include/gtest/gtest.h" +#if defined(OS_WIN) +#include "base/win/windows_version.h" +#endif + using base::JSONWriter; using content::RenderProcessHost; using content::WebContents; diff --git a/chrome/browser/extensions/extension_loading_browsertest.cc b/chrome/browser/extensions/extension_loading_browsertest.cc index 3371bf9cf25a59..095be6cd6e1b2c 100644 --- a/chrome/browser/extensions/extension_loading_browsertest.cc +++ b/chrome/browser/extensions/extension_loading_browsertest.cc @@ -8,7 +8,6 @@ #include "base/run_loop.h" #include "base/strings/stringprintf.h" #include "base/version.h" -#include "base/win/windows_version.h" #include "build/build_config.h" #include "chrome/browser/extensions/devtools_util.h" #include "chrome/browser/extensions/extension_browsertest.h" @@ -26,6 +25,10 @@ #include "net/test/embedded_test_server/embedded_test_server.h" #include "testing/gmock/include/gmock/gmock.h" +#if defined(OS_WIN) +#include "base/win/windows_version.h" +#endif + namespace extensions { namespace { diff --git a/chrome/browser/media/encrypted_media_browsertest.cc b/chrome/browser/media/encrypted_media_browsertest.cc index d3ece5603c5aad..e61ef839ce447a 100644 --- a/chrome/browser/media/encrypted_media_browsertest.cc +++ b/chrome/browser/media/encrypted_media_browsertest.cc @@ -8,7 +8,6 @@ #include "base/command_line.h" #include "base/path_service.h" #include "base/strings/utf_string_conversions.h" -#include "base/win/windows_version.h" #include "build/build_config.h" #include "chrome/browser/media/media_browsertest.h" #include "chrome/browser/media/test_license_server.h" @@ -27,6 +26,10 @@ #include "base/android/build_info.h" #endif +#if defined(OS_WIN) +#include "base/win/windows_version.h" +#endif + #if BUILDFLAG(ENABLE_PEPPER_CDMS) #include "chrome/browser/media/pepper_cdm_test_constants.h" #include "chrome/browser/media/pepper_cdm_test_helper.h" diff --git a/chrome/browser/nacl_host/test/nacl_gdb_browsertest.cc b/chrome/browser/nacl_host/test/nacl_gdb_browsertest.cc index 4555f8c66080ef..199e51667de465 100644 --- a/chrome/browser/nacl_host/test/nacl_gdb_browsertest.cc +++ b/chrome/browser/nacl_host/test/nacl_gdb_browsertest.cc @@ -8,12 +8,15 @@ #include "base/environment.h" #include "base/files/file_util.h" #include "base/path_service.h" -#include "base/win/windows_version.h" #include "build/build_config.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/ppapi/ppapi_test.h" #include "components/nacl/common/nacl_switches.h" +#if defined(OS_WIN) +#include "base/win/windows_version.h" +#endif + static const base::FilePath::CharType kMockNaClGdb[] = #if defined(OS_WIN) FILE_PATH_LITERAL("mock_nacl_gdb.exe"); diff --git a/chrome/browser/password_manager/password_store_factory.cc b/chrome/browser/password_manager/password_store_factory.cc index 862f2f129afb97..65020c1482d197 100644 --- a/chrome/browser/password_manager/password_store_factory.cc +++ b/chrome/browser/password_manager/password_store_factory.cc @@ -21,7 +21,6 @@ #include "chrome/common/chrome_switches.h" #include "components/browser_sync/profile_sync_service.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" -#include "components/os_crypt/key_storage_util_linux.h" #include "components/os_crypt/os_crypt_switches.h" #include "components/password_manager/core/browser/login_database.h" #include "components/password_manager/core/browser/password_store.h" @@ -43,7 +42,7 @@ #elif defined(OS_CHROMEOS) || defined(OS_ANDROID) // Don't do anything. We're going to use the default store. #elif defined(USE_X11) -#include "base/nix/xdg_util.h" +#include "components/os_crypt/key_storage_util_linux.h" #if defined(USE_GNOME_KEYRING) #include "chrome/browser/password_manager/native_backend_gnome_x.h" #endif diff --git a/chrome/browser/ui/views/create_application_shortcut_view.cc b/chrome/browser/ui/views/create_application_shortcut_view.cc index 427d84795d6558..d483bd1cfffe5b 100644 --- a/chrome/browser/ui/views/create_application_shortcut_view.cc +++ b/chrome/browser/ui/views/create_application_shortcut_view.cc @@ -12,7 +12,6 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/strings/utf_string_conversions.h" -#include "base/win/windows_version.h" #include "build/build_config.h" #include "chrome/browser/extensions/tab_helper.h" #include "chrome/browser/profiles/profile.h" @@ -56,6 +55,7 @@ #if defined(OS_WIN) #include "base/win/shortcut.h" +#include "base/win/windows_version.h" #endif // defined(OS_WIN) namespace { diff --git a/chrome/browser/ui/views/profiles/new_avatar_button.cc b/chrome/browser/ui/views/profiles/new_avatar_button.cc index 160c44fccb1ca4..9e49e2ba0be375 100644 --- a/chrome/browser/ui/views/profiles/new_avatar_button.cc +++ b/chrome/browser/ui/views/profiles/new_avatar_button.cc @@ -6,7 +6,6 @@ #include -#include "base/win/windows_version.h" #include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile_attributes_entry.h" @@ -26,6 +25,10 @@ #include "ui/views/controls/button/label_button_border.h" #include "ui/views/painter.h" +#if defined(OS_WIN) +#include "base/win/windows_version.h" +#endif + namespace { std::unique_ptr CreateBorder(const int normal_image_set[], diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc index 3ee31d5056cba0..d490a6f7e73ef9 100644 --- a/chrome/common/chrome_paths.cc +++ b/chrome/common/chrome_paths.cc @@ -7,7 +7,6 @@ #include "base/files/file_util.h" #include "base/lazy_instance.h" #include "base/logging.h" -#include "base/mac/bundle_locations.h" #include "base/path_service.h" #include "base/strings/string_util.h" #include "base/sys_info.h" @@ -28,6 +27,7 @@ #endif #if defined(OS_MACOSX) +#include "base/mac/bundle_locations.h" #include "base/mac/foundation_util.h" #endif diff --git a/chrome/test/nacl/nacl_browsertest.cc b/chrome/test/nacl/nacl_browsertest.cc index 553ff052c289cf..b2fbdf4f48fcdc 100644 --- a/chrome/test/nacl/nacl_browsertest.cc +++ b/chrome/test/nacl/nacl_browsertest.cc @@ -18,7 +18,6 @@ #include "base/process/launch.h" #include "base/process/process.h" #include "base/strings/string_number_conversions.h" -#include "base/win/windows_version.h" #include "build/build_config.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" @@ -27,6 +26,10 @@ #include "components/nacl/common/nacl_switches.h" #include "content/public/common/content_switches.h" +#if defined(OS_WIN) +#include "base/win/windows_version.h" +#endif + namespace { #if defined(OS_WIN) diff --git a/chrome/test/ppapi/ppapi_browsertest.cc b/chrome/test/ppapi/ppapi_browsertest.cc index e78ed0a507d0e1..87c5f8dcbb4711 100644 --- a/chrome/test/ppapi/ppapi_browsertest.cc +++ b/chrome/test/ppapi/ppapi_browsertest.cc @@ -7,7 +7,6 @@ #include "base/macros.h" #include "base/path_service.h" #include "base/test/test_timeouts.h" -#include "base/win/windows_version.h" #include "build/build_config.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/browser/extensions/extension_browsertest.h" @@ -37,6 +36,10 @@ #include "base/mac/mac_util.h" #endif +#if defined(OS_WIN) +#include "base/win/windows_version.h" +#endif + using content::RenderViewHost; // This macro finesses macro expansion to do what we want. diff --git a/components/nacl/browser/nacl_browser.cc b/components/nacl/browser/nacl_browser.cc index ca3fb97be5de09..f979624ef677a5 100644 --- a/components/nacl/browser/nacl_browser.cc +++ b/components/nacl/browser/nacl_browser.cc @@ -17,11 +17,14 @@ #include "base/single_thread_task_runner.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/time.h" -#include "base/win/windows_version.h" #include "build/build_config.h" #include "content/public/browser/browser_thread.h" #include "url/gurl.h" +#if defined(OS_WIN) +#include "base/win/windows_version.h" +#endif + namespace { // An arbitrary delay to coalesce multiple writes to the cache. diff --git a/components/nacl/browser/nacl_process_host.cc b/components/nacl/browser/nacl_process_host.cc index 2c9457f2f08eb4..989de24b838bc9 100644 --- a/components/nacl/browser/nacl_process_host.cc +++ b/components/nacl/browser/nacl_process_host.cc @@ -32,7 +32,6 @@ #include "base/sys_byteorder.h" #include "base/threading/sequenced_worker_pool.h" #include "base/threading/thread_task_runner_handle.h" -#include "base/win/windows_version.h" #include "build/build_config.h" #include "components/nacl/browser/nacl_browser.h" #include "components/nacl/browser/nacl_browser_delegate.h" @@ -78,6 +77,7 @@ #include "base/threading/thread.h" #include "base/win/scoped_handle.h" +#include "base/win/windows_version.h" #include "components/nacl/browser/nacl_broker_service_win.h" #include "components/nacl/common/nacl_debug_exception_handler_win.h" #include "content/public/common/sandbox_init.h" diff --git a/components/update_client/update_query_params.cc b/components/update_client/update_query_params.cc index 42c8c91ff526b5..5cd745b1198d7a 100644 --- a/components/update_client/update_query_params.cc +++ b/components/update_client/update_query_params.cc @@ -6,10 +6,13 @@ #include "base/logging.h" #include "base/strings/stringprintf.h" -#include "base/win/windows_version.h" #include "build/build_config.h" #include "components/update_client/update_query_params_delegate.h" +#if defined(OS_WIN) +#include "base/win/windows_version.h" +#endif + namespace update_client { namespace { diff --git a/components/update_client/utils.cc b/components/update_client/utils.cc index 6af11aebf18344..0abcbb273c3f8a 100644 --- a/components/update_client/utils.cc +++ b/components/update_client/utils.cc @@ -23,7 +23,6 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/sys_info.h" -#include "base/win/windows_version.h" #include "build/build_config.h" #include "components/crx_file/id_util.h" #include "components/data_use_measurement/core/data_use_user_data.h" @@ -41,6 +40,10 @@ #include "net/url_request/url_request_status.h" #include "url/gurl.h" +#if defined(OS_WIN) +#include "base/win/windows_version.h" +#endif + namespace update_client { namespace { diff --git a/components/url_formatter/elide_url_unittest.cc b/components/url_formatter/elide_url_unittest.cc index 56058fe78fb970..e8a92019f063fe 100644 --- a/components/url_formatter/elide_url_unittest.cc +++ b/components/url_formatter/elide_url_unittest.cc @@ -6,7 +6,6 @@ #include -#include "base/ios/ios_util.h" #include "base/macros.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" @@ -21,6 +20,10 @@ #include "ui/gfx/text_utils.h" // nogncheck #endif +#if defined(OS_IOS) +#include "base/ios/ios_util.h" +#endif + namespace { struct Testcase { diff --git a/content/browser/media/encrypted_media_browsertest.cc b/content/browser/media/encrypted_media_browsertest.cc index 066b81111c60f1..2b18cd2d6ae977 100644 --- a/content/browser/media/encrypted_media_browsertest.cc +++ b/content/browser/media/encrypted_media_browsertest.cc @@ -4,7 +4,6 @@ #include "base/command_line.h" #include "base/strings/utf_string_conversions.h" -#include "base/win/windows_version.h" #include "build/build_config.h" #include "content/browser/media/media_browsertest.h" #include "content/public/common/content_switches.h" @@ -17,6 +16,10 @@ #include "base/android/build_info.h" #endif +#if defined(OS_WIN) +#include "base/win/windows_version.h" +#endif + #if defined(ENABLE_MOJO_CDM) // When mojo CDM is enabled, External Clear Key is supported in //content/shell/ // by using mojo CDM with AesDecryptor running in the remote (e.g. GPU or diff --git a/content/common/content_paths.cc b/content/common/content_paths.cc index 0268287386ca2d..60ba02e3a6d31b 100644 --- a/content/common/content_paths.cc +++ b/content/common/content_paths.cc @@ -5,10 +5,13 @@ #include "content/public/common/content_paths.h" #include "base/files/file_util.h" -#include "base/mac/bundle_locations.h" #include "base/path_service.h" #include "build/build_config.h" +#if defined(OS_MACOSX) +#include "base/mac/bundle_locations.h" +#endif + namespace content { bool PathProvider(int key, base::FilePath* result) { diff --git a/content/renderer/media/webrtc_audio_device_impl.cc b/content/renderer/media/webrtc_audio_device_impl.cc index 84a15f69b4ac17..a7111d0eaaa60b 100644 --- a/content/renderer/media/webrtc_audio_device_impl.cc +++ b/content/renderer/media/webrtc_audio_device_impl.cc @@ -8,13 +8,16 @@ #include "base/metrics/histogram_macros.h" #include "base/strings/string_util.h" #include "base/trace_event/trace_event.h" -#include "base/win/windows_version.h" #include "content/renderer/media/webrtc/processed_local_audio_source.h" #include "content/renderer/media/webrtc_audio_renderer.h" #include "media/audio/sample_rates.h" #include "media/base/audio_bus.h" #include "media/base/audio_parameters.h" +#if defined(OS_WIN) +#include "base/win/windows_version.h" +#endif + using media::AudioParameters; using media::ChannelLayout; diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc index 6ecd9f21b4ac11..dba3cbfb105112 100644 --- a/content/renderer/render_view_browsertest.cc +++ b/content/renderer/render_view_browsertest.cc @@ -19,7 +19,6 @@ #include "base/threading/thread_task_runner_handle.h" #include "base/time/time.h" #include "base/values.h" -#include "base/win/windows_version.h" #include "build/build_config.h" #include "cc/trees/layer_tree.h" #include "cc/trees/layer_tree_host.h" @@ -88,6 +87,10 @@ #include "ui/gfx/range/range.h" #include "ui/native_theme/native_theme_switches.h" +#if defined(OS_WIN) +#include "base/win/windows_version.h" +#endif + #if defined(USE_AURA) && defined(USE_X11) #include #include "base/memory/ptr_util.h" diff --git a/ui/app_list/views/app_list_view.cc b/ui/app_list/views/app_list_view.cc index 93af33daca86ab..0a251ef1c354d7 100644 --- a/ui/app_list/views/app_list_view.cc +++ b/ui/app_list/views/app_list_view.cc @@ -11,7 +11,6 @@ #include "base/metrics/histogram.h" #include "base/profiler/scoped_tracker.h" #include "base/strings/string_util.h" -#include "base/win/windows_version.h" #include "build/build_config.h" #include "ui/app_list/app_list_constants.h" #include "ui/app_list/app_list_model.h" @@ -48,6 +47,10 @@ #include "ui/wm/core/masked_window_targeter.h" #include "ui/wm/core/shadow_types.h" +#if defined(OS_WIN) +#include "base/win/windows_version.h" +#endif + namespace app_list { namespace {