0

Run gn --format over all .gn files

The recent formatter alphebetizing change is causing a lot of noise in
code reviews. Figured it'd be worth a clean-up CL.

Exact command I ran:
find . -name "*.gn*" -exec gn format --in-place "{}" \;

TBR=ddorwin@chromium.org
BUG=554928
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel

Review URL: https://codereview.chromium.org/1464873002

Cr-Commit-Position: refs/heads/master@{#360891}
This commit is contained in:
agrieve
2015-11-20 11:53:28 -08:00
committed by Commit bot
parent 505f20a95d
commit d7a71c8899
220 changed files with 595 additions and 604 deletions
BUILD.gn
android_webview
ash
base
blimp
client
engine
browser
breakpad
build
config
secondary
third_party
android_tools
cc
chrome
BUILD.gn
android
app_shim
browser
BUILD.gn
chromeos
devtools
extensions
resources
chromeos
chromevox
ui
chrome_repack_locales.gni
chrome_watcher
common
installer
renderer
service
test
utility
chromecast
BUILD.gn
browser
media
BUILD.gn
cma
pipeline
renderer
chromeos
cloud_print/service/win
components
BUILD.gn
autofill
content
browser
renderer
core
browser
ios
browser
bitmap_uploader
browser_sync
browser
cdm
common
chrome_apps
component_updater
constrained_window
copresence
crash
content
core
common
data_reduction_proxy
content
browser
drive
exo
wayland
feedback
gcm_driver
BUILD.gn
crypto
instance_id
html_viewer
login
mus
BUILD.gn
example
window_type_launcher
public
interfaces
ws
nacl
net_log
omnibox
browser
ownership
pairing
password_manager
sync
browser
pdf
renderer
pdf_viewer
policy
android
precache
android
proximity_auth
renderer_context_menu
rlz
search_engines
signin
core
browser
sync_driver
sync_sessions
syncable_prefs
translate
ios
browser
update_client
url_formatter
user_prefs
tracked
variations
version_info
web_contents_delegate_android
web_resource
web_view
BUILD.gn
public
interfaces
webcrypto
webp_transcode
content
plugin
ppapi_plugin
public
android
renderer
renderer
shell
test
device
bluetooth
usb
extensions
BUILD.gn
common
components
native_app_window
shell
gpu
BUILD.gn
blink
command_buffer
client
gles2_conform_support
ios
ipc/mojo
jingle
mandoline
BUILD.gn
app
android
ui
desktop_ui
phone_ui
mash/wm
media
base
blink
cast
midi
mojo
services
test
mojo
android
application
public
converters
surfaces
transform
edk
embedder
js
system
package_manager
public
runner
services
network
shell
net
ppapi
host
native_client
remoting
BUILD.gn
host
test
tools
javascript_key_tester
webapp
sandbox
skia
sql
storage/common
sync
testing/android/junit
third_party
WebKit
Source
bindings
core
modules
scripts
core
devtools
modules
web
public
android_media
cld_2
custom_tabs_client
fontconfig
freetype-android
libjingle
libphonenumber
libvpx_new
mesa
mockito
mojo
src
mojo
edk
embedder
js
system
robolectric
widevine
yasm
tools/android
heap_profiler
kerberos
SpnegoAuthenticator
ui
android
app_list
aura
base
compositor
file_manager
gfx
keyboard
message_center
ozone
platform
cast
headless
platform_window
android
resources
shell_dialogs
strings
views
wm
url
win8

@@ -708,7 +708,7 @@ group("gn_only") {
# these are needed only for gn to discover build files. # these are needed only for gn to discover build files.
deps += [ deps += [
"//testing/libfuzzer:libfuzzer_main", "//testing/libfuzzer:libfuzzer_main",
"//testing/libfuzzer/fuzzers:string_to_int_fuzzer" "//testing/libfuzzer/fuzzers:string_to_int_fuzzer",
] ]
} }
} }

@@ -98,11 +98,11 @@ repack("repack_pack") {
] ]
deps = [ deps = [
":generate_aw_resources", ":generate_aw_resources",
"//content:resources",
"//content/app/resources",
"//net:net_resources",
"//third_party/WebKit/public:image_resources", "//third_party/WebKit/public:image_resources",
"//third_party/WebKit/public:resources", "//third_party/WebKit/public:resources",
"//content/app/resources",
"//content:resources",
"//net:net_resources",
"//ui/resources", "//ui/resources",
] ]
output = "$target_gen_dir/webviewchromium.pak" output = "$target_gen_dir/webviewchromium.pak"
@@ -471,15 +471,15 @@ source_set("common") {
"//cc/surfaces", "//cc/surfaces",
"//components/auto_login_parser:auto_login_parser", "//components/auto_login_parser:auto_login_parser",
"//components/autofill/content/renderer", "//components/autofill/content/renderer",
"//components/crash/content/app",
"//components/crash/content/browser",
"//components/cdm/browser", "//components/cdm/browser",
"//components/cdm/renderer", "//components/cdm/renderer",
"//components/crash/content/app",
"//components/crash/content/browser",
"//components/data_reduction_proxy/core/browser", "//components/data_reduction_proxy/core/browser",
"//components/devtools_discovery", "//components/devtools_discovery",
"//components/navigation_interception", "//components/navigation_interception",
"//components/printing/common",
"//components/printing/browser", "//components/printing/browser",
"//components/printing/common",
"//components/printing/renderer", "//components/printing/renderer",
"//components/visitedlink/browser", "//components/visitedlink/browser",
"//components/visitedlink/renderer", "//components/visitedlink/renderer",
@@ -489,11 +489,11 @@ source_set("common") {
"//content/public/browser", "//content/public/browser",
"//gin", "//gin",
"//gpu/blink", "//gpu/blink",
"//gpu/command_buffer/common:gles2_utils",
"//gpu/command_buffer/service",
"//gpu/command_buffer/client:gl_in_process_context", "//gpu/command_buffer/client:gl_in_process_context",
"//gpu/command_buffer/client:gles2_c_lib", "//gpu/command_buffer/client:gles2_c_lib",
"//gpu/command_buffer/client:gles2_implementation", "//gpu/command_buffer/client:gles2_implementation",
"//gpu/command_buffer/common:gles2_utils",
"//gpu/command_buffer/service",
"//gpu/skia_bindings", "//gpu/skia_bindings",
"//media", "//media",
"//media/midi", "//media/midi",

@@ -7,6 +7,7 @@ import("//build/config/android/rules.gni")
source_set("native") { source_set("native") {
deps = [ deps = [
":native_jni",
"//android_webview/common:version", "//android_webview/common:version",
"//base", "//base",
"//base/third_party/dynamic_annotations:dynamic_annotations", "//base/third_party/dynamic_annotations:dynamic_annotations",
@@ -21,11 +22,10 @@ source_set("native") {
"//skia", "//skia",
"//storage/browser", "//storage/browser",
"//storage/common", "//storage/common",
"//third_party/boringssl",
"//ui/base", "//ui/base",
"//ui/gfx", "//ui/gfx",
"//ui/gfx/geometry:geometry", "//ui/gfx/geometry:geometry",
"//third_party/boringssl",
":native_jni",
] ]
include_dirs = [ "//skia/config" ] include_dirs = [ "//skia/config" ]

@@ -96,15 +96,15 @@ component("ash") {
if (is_chromeos) { if (is_chromeos) {
deps += [ deps += [
"//device/bluetooth",
"//ui/display",
"//ui/display/util",
"//chromeos", "//chromeos",
"//chromeos:power_manager_proto", "//chromeos:power_manager_proto",
"//device/bluetooth",
"//third_party/qcms", "//third_party/qcms",
"//ui/chromeos:ui_chromeos",
"//ui/chromeos/resources", "//ui/chromeos/resources",
"//ui/chromeos/strings", "//ui/chromeos/strings",
"//ui/chromeos:ui_chromeos", "//ui/display",
"//ui/display/util",
] ]
} else { } else {
sources -= [ sources -= [
@@ -245,7 +245,6 @@ static_library("ash_shell_lib") {
"//ash/strings", "//ash/strings",
"//base", "//base",
"//base:i18n", "//base:i18n",
"//net", "//net",
"//skia", "//skia",
"//third_party/icu", "//third_party/icu",
@@ -275,9 +274,9 @@ static_library("ash_shell_lib_with_content") {
deps = [ deps = [
#"//chrome:packed_resources", TODO(GYP) #"//chrome:packed_resources", TODO(GYP)
":ash_shell_lib",
"//content", "//content",
"//content/shell:content_shell_lib", "//content/shell:content_shell_lib",
":ash_shell_lib",
"//skia", "//skia",
] ]
} }
@@ -306,14 +305,14 @@ test("ash_unittests") {
"//ui/aura", "//ui/aura",
"//ui/aura:test_support", "//ui/aura:test_support",
"//ui/base", "//ui/base",
"//ui/base/ime",
"//ui/base:test_support", "//ui/base:test_support",
"//ui/base/ime",
"//ui/compositor", "//ui/compositor",
"//ui/compositor:test_support", "//ui/compositor:test_support",
"//ui/events", "//ui/events",
"//ui/events/devices",
"//ui/events:test_support",
"//ui/events:gesture_detection", "//ui/events:gesture_detection",
"//ui/events:test_support",
"//ui/events/devices",
"//ui/gfx", "//ui/gfx",
"//ui/gfx/geometry", "//ui/gfx/geometry",
"//ui/keyboard", "//ui/keyboard",
@@ -361,13 +360,13 @@ test("ash_unittests") {
if (is_chromeos) { if (is_chromeos) {
sources += [ "first_run/first_run_helper_unittest.cc" ] sources += [ "first_run/first_run_helper_unittest.cc" ]
deps += [ deps += [
"//chromeos:power_manager_proto",
"//chromeos:test_support_without_gmock",
"//device/bluetooth", "//device/bluetooth",
"//ui/display", "//ui/display",
"//ui/display:test_support", "//ui/display:test_support",
"//ui/display:test_util", "//ui/display:test_util",
"//ui/display/types", "//ui/display/types",
"//chromeos:power_manager_proto",
"//chromeos:test_support_without_gmock",
] ]
} else { } else {
sources -= [ sources -= [

@@ -734,8 +734,8 @@ component("base") {
deps += [ deps += [
":base_jni_headers", ":base_jni_headers",
"//third_party/ashmem",
"//third_party/android_tools:cpu_features", "//third_party/android_tools:cpu_features",
"//third_party/ashmem",
] ]
# logging.cc uses the Android logging library. # logging.cc uses the Android logging library.
@@ -1073,8 +1073,8 @@ if (is_ios || is_android || is_win || (is_linux && !is_chromeos)) {
":base", ":base",
"//base/test:test_support", "//base/test:test_support",
"//base/test:test_support_perf", "//base/test:test_support_perf",
"//testing/perf",
"//testing/gtest", "//testing/gtest",
"//testing/perf",
] ]
if (is_android) { if (is_android) {

@@ -143,15 +143,15 @@ source_set("test_support") {
public_deps = [ public_deps = [
":test_config", ":test_config",
"//base", "//base",
"//base:i18n",
"//base:base_static", "//base:base_static",
"//base:i18n",
] ]
deps = [ deps = [
"//base/third_party/dynamic_annotations", "//base/third_party/dynamic_annotations",
"//testing/gmock", "//testing/gmock",
"//testing/gtest", "//testing/gtest",
"//third_party/libxml",
"//third_party/icu:icuuc", "//third_party/icu:icuuc",
"//third_party/libxml",
] ]
if (!is_posix) { if (!is_posix) {

@@ -192,10 +192,10 @@ if (is_android) {
android_apk("blimp_apk") { android_apk("blimp_apk") {
deps = [ deps = [
":blimp_apk_manifest", ":blimp_apk_manifest",
":blimp_java",
":blimp_java_resources",
":blimp_client", ":blimp_client",
":blimp_java", ":blimp_java",
":blimp_java",
":blimp_java_resources",
"//base:base_java", "//base:base_java",
google_play_services_resources, google_play_services_resources,
] ]

@@ -23,8 +23,8 @@ source_set("browser") {
deps = [ deps = [
"//base", "//base",
"//blimp/common/proto", "//blimp/common/proto",
"//blimp/net:blimp_net",
"//blimp/engine/ui", "//blimp/engine/ui",
"//blimp/net:blimp_net",
"//content", "//content",
"//content/public/browser", "//content/public/browser",
"//content/public/common", "//content/public/common",

@@ -378,9 +378,9 @@ if (is_mac) {
include_dirs = [ "src/client/apple/Framework" ] include_dirs = [ "src/client/apple/Framework" ]
deps = [ deps = [
":utilities",
":crash_inspector", ":crash_inspector",
":crash_report_sender", ":crash_report_sender",
":utilities",
] ]
} }
@@ -622,12 +622,12 @@ if (is_linux || is_android) {
deps = [ deps = [
":client", ":client",
":processor_support",
":linux_dumper_unittest_helper", ":linux_dumper_unittest_helper",
":processor_support",
"//build/config/sanitizers:deps", "//build/config/sanitizers:deps",
"//testing/gmock",
"//testing/gtest", "//testing/gtest",
"//testing/gtest:gtest_main", "//testing/gtest:gtest_main",
"//testing/gmock",
] ]
include_dirs = [ include_dirs = [

@@ -169,8 +169,8 @@ template("ios_app") {
identity = invoker.code_signing_identity identity = invoker.code_signing_identity
application_path = "$root_build_dir/$app_name.app" application_path = "$root_build_dir/$app_name.app"
deps = [ deps = [
":$plist_gen_target_name",
":$bin_gen_target_name", ":$bin_gen_target_name",
":$plist_gen_target_name",
] ]
} }
} else { } else {
@@ -181,8 +181,8 @@ template("ios_app") {
# Top level group # Top level group
group(target_name) { group(target_name) {
deps = [ deps = [
":$plist_gen_target_name",
":$bin_gen_target_name", ":$bin_gen_target_name",
":$plist_gen_target_name",
] ]
if (invoker.code_signing_identity != "") { if (invoker.code_signing_identity != "") {
deps += [ ":$code_sign_gen_target_name" ] deps += [ ":$code_sign_gen_target_name" ]

@@ -195,10 +195,10 @@ template("mac_app") {
group(copy_all_target_name) { group(copy_all_target_name) {
visibility = [ ":$group_gen_target_name" ] visibility = [ ":$group_gen_target_name" ]
deps = [ deps = [
":$struct_gen_target_name",
":$copy_plist_gen_target_name",
":$copy_bin_target_name", ":$copy_bin_target_name",
":$copy_plist_gen_target_name",
":$copy_xib_target_name", ":$copy_xib_target_name",
":$struct_gen_target_name",
] ]
} }

@@ -68,8 +68,8 @@ android_resources("android_support_v7_mediarouter_resources") {
android_java_prebuilt("android_support_v7_mediarouter_java") { android_java_prebuilt("android_support_v7_mediarouter_java") {
deps = [ deps = [
":android_support_v7_mediarouter_resources",
":android_support_v7_appcompat_java", ":android_support_v7_appcompat_java",
":android_support_v7_mediarouter_resources",
] ]
jar_path = "$android_sdk_root/extras/android/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar" jar_path = "$android_sdk_root/extras/android/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar"
} }

@@ -686,9 +686,9 @@ source_set("test_support") {
"//base/third_party/dynamic_annotations", "//base/third_party/dynamic_annotations",
"//cc/surfaces", "//cc/surfaces",
"//cc/surfaces:surface_id", "//cc/surfaces:surface_id",
"//gpu/command_buffer/client:gl_in_process_context",
"//gpu/command_buffer/client:gles2_c_lib", "//gpu/command_buffer/client:gles2_c_lib",
"//gpu/command_buffer/client:gles2_implementation", "//gpu/command_buffer/client:gles2_implementation",
"//gpu/command_buffer/client:gl_in_process_context",
"//gpu/command_buffer/common:gles2_utils", "//gpu/command_buffer/common:gles2_utils",
"//gpu/skia_bindings", "//gpu/skia_bindings",
"//media", "//media",
@@ -696,8 +696,8 @@ source_set("test_support") {
"//testing/gmock", "//testing/gmock",
"//testing/gtest", "//testing/gtest",
"//ui/gfx", "//ui/gfx",
"//ui/gfx/geometry",
"//ui/gfx:test_support", "//ui/gfx:test_support",
"//ui/gfx/geometry",
"//ui/gl", "//ui/gl",
"//ui/gl:test_support", "//ui/gl:test_support",
] ]
@@ -888,8 +888,8 @@ test("cc_unittests") {
"//testing/gtest", "//testing/gtest",
"//ui/events:events_base", "//ui/events:events_base",
"//ui/gfx", "//ui/gfx",
"//ui/gfx/geometry",
"//ui/gfx:test_support", "//ui/gfx:test_support",
"//ui/gfx/geometry",
"//ui/gl", "//ui/gl",
"//ui/gl:test_support", "//ui/gl:test_support",
] ]

@@ -90,13 +90,13 @@ if (!is_mac) {
":blink", ":blink",
"//base/test:test_support", "//base/test:test_support",
"//base/third_party/dynamic_annotations", "//base/third_party/dynamic_annotations",
"//cc",
"//cc:test_support",
"//skia", "//skia",
"//testing/gtest", "//testing/gtest",
"//third_party/WebKit/public:blink", "//third_party/WebKit/public:blink",
"//ui/gfx/geometry",
"//ui/gfx:test_support", "//ui/gfx:test_support",
"//cc", "//ui/gfx/geometry",
"//cc:test_support",
] ]
} }
} }

@@ -620,9 +620,9 @@ if (is_chrome_branded) {
group("packed_resources") { group("packed_resources") {
public_deps = [ public_deps = [
":repack_chrome_100_percent",
":repack_locales_pack", ":repack_locales_pack",
":repack_pseudo_locales_pack", ":repack_pseudo_locales_pack",
":repack_chrome_100_percent",
] ]
if (is_chrome_branded) { if (is_chrome_branded) {
@@ -659,15 +659,15 @@ repack("packed_extra_resources") {
"$root_gen_dir/ui/resources/webui_resources.pak", "$root_gen_dir/ui/resources/webui_resources.pak",
] ]
deps = [ deps = [
"//chrome/browser:resources",
"//chrome/app/theme:chrome_unscaled_resources", "//chrome/app/theme:chrome_unscaled_resources",
"//chrome/common:resources", "//chrome/browser:resources",
"//chrome/browser/resources:invalidations_resources", "//chrome/browser/resources:invalidations_resources",
"//chrome/browser/resources:memory_internals_resources", "//chrome/browser/resources:memory_internals_resources",
"//chrome/browser/resources:net_internals_resources", "//chrome/browser/resources:net_internals_resources",
"//chrome/browser/resources:password_manager_internals_resources", "//chrome/browser/resources:password_manager_internals_resources",
"//chrome/browser/resources:signin_internals_resources", "//chrome/browser/resources:signin_internals_resources",
"//chrome/browser/resources:translate_internals_resources", "//chrome/browser/resources:translate_internals_resources",
"//chrome/common:resources",
"//components/resources", "//components/resources",
"//net:net_resources", "//net:net_resources",
"//ui/resources", "//ui/resources",
@@ -688,8 +688,8 @@ repack("packed_extra_resources") {
"//chrome/browser/devtools:webrtc_device_provider_resources", "//chrome/browser/devtools:webrtc_device_provider_resources",
"//chrome/browser/resources:component_extension_resources", "//chrome/browser/resources:component_extension_resources",
"//chrome/browser/resources:options_resources", "//chrome/browser/resources:options_resources",
"//chrome/browser/resources:settings_resources",
"//chrome/browser/resources:quota_internals_resources", "//chrome/browser/resources:quota_internals_resources",
"//chrome/browser/resources:settings_resources",
"//chrome/browser/resources:sync_file_system_internals_resources", "//chrome/browser/resources:sync_file_system_internals_resources",
"//content/browser/devtools:devtools_resources", "//content/browser/devtools:devtools_resources",
] ]

@@ -51,9 +51,9 @@ android_resources("chrome_java_resources") {
deps = [ deps = [
":chrome_locale_paks", ":chrome_locale_paks",
":chrome_strings_grd", ":chrome_strings_grd",
"//chrome/app:java_strings_grd",
"//components/policy:app_restrictions_resources", "//components/policy:app_restrictions_resources",
"//content/public/android:content_java_resources", "//content/public/android:content_java_resources",
"//chrome/app:java_strings_grd",
"//third_party/android_data_chart:android_data_chart_java_resources", "//third_party/android_data_chart:android_data_chart_java_resources",
"//third_party/android_media:android_media_resources", "//third_party/android_media:android_media_resources",
] ]
@@ -120,7 +120,6 @@ android_library("chrome_java") {
":chrome_java_resources", ":chrome_java_resources",
":document_tab_model_info_proto_java", ":document_tab_model_info_proto_java",
"//base:base_java", "//base:base_java",
"//net/android:net_java",
"//components/bookmarks/common/android:bookmarks_java", "//components/bookmarks/common/android:bookmarks_java",
"//components/dom_distiller/android:dom_distiller_content_java", "//components/dom_distiller/android:dom_distiller_content_java",
"//components/dom_distiller/android:dom_distiller_core_java", "//components/dom_distiller/android:dom_distiller_core_java",
@@ -136,8 +135,12 @@ android_library("chrome_java") {
"//components/web_contents_delegate_android:web_contents_delegate_android_java", "//components/web_contents_delegate_android:web_contents_delegate_android_java",
"//content/public/android:content_java", "//content/public/android:content_java",
"//media/base/android:media_java", "//media/base/android:media_java",
"//media/base/android:media_java",
"//media/midi:midi_java",
"//net/android:net_java",
"//printing:printing_java", "//printing:printing_java",
"//sync/android:sync_java", "//sync/android:sync_java",
"//third_party/WebKit/public:blink_headers_java",
"//third_party/android_data_chart:android_data_chart_java", "//third_party/android_data_chart:android_data_chart_java",
"//third_party/android_media:android_media_java", "//third_party/android_media:android_media_java",
"//third_party/android_protobuf:protobuf_nano_javalib", "//third_party/android_protobuf:protobuf_nano_javalib",
@@ -152,9 +155,6 @@ android_library("chrome_java") {
"//third_party/cacheinvalidation:cacheinvalidation_proto_java", "//third_party/cacheinvalidation:cacheinvalidation_proto_java",
"//third_party/gif_player:gif_player_java", "//third_party/gif_player:gif_player_java",
"//third_party/jsr-305:jsr_305_javalib", "//third_party/jsr-305:jsr_305_javalib",
"//third_party/WebKit/public:blink_headers_java",
"//media/base/android:media_java",
"//media/midi:midi_java",
"//ui/android:ui_java", "//ui/android:ui_java",
"//ui/android:ui_java_resources", "//ui/android:ui_java_resources",
google_play_services_library, google_play_services_library,
@@ -257,9 +257,9 @@ junit_binary("chrome_junit_tests") {
"//components/invalidation/impl:java", "//components/invalidation/impl:java",
"//sync:sync_java_test_support", "//sync:sync_java_test_support",
"//sync/android:sync_java", "//sync/android:sync_java",
"//third_party/android_tools:android_support_v7_mediarouter_java",
"//third_party/cacheinvalidation:cacheinvalidation_javalib", "//third_party/cacheinvalidation:cacheinvalidation_javalib",
"//third_party/junit:hamcrest", "//third_party/junit:hamcrest",
"//third_party/android_tools:android_support_v7_mediarouter_java",
google_play_services_library, google_play_services_library,
] ]
} }
@@ -322,12 +322,12 @@ android_library("chrome_shared_test_java") {
"//net/android:net_java", "//net/android:net_java",
"//net/android:net_java_test_support", "//net/android:net_java_test_support",
"//printing:printing_java", "//printing:printing_java",
"//sync:sync_java_test_support",
"//sync/android:sync_java", "//sync/android:sync_java",
"//sync/android:sync_javatests", "//sync/android:sync_javatests",
"//sync:sync_java_test_support", "//third_party/android_tools:android_support_v13_java",
"//third_party/android_tools:android_support_v7_appcompat_java", "//third_party/android_tools:android_support_v7_appcompat_java",
"//third_party/android_tools:android_support_v7_recyclerview_java", "//third_party/android_tools:android_support_v7_recyclerview_java",
"//third_party/android_tools:android_support_v13_java",
"//third_party/android_tools:legacy_http_javalib", "//third_party/android_tools:legacy_http_javalib",
"//third_party/cacheinvalidation:cacheinvalidation_javalib", "//third_party/cacheinvalidation:cacheinvalidation_javalib",
"//third_party/jsr-305:jsr_305_javalib", "//third_party/jsr-305:jsr_305_javalib",

@@ -11,7 +11,7 @@ source_set("app_shim") {
] ]
deps = [ deps = [
"//chrome/common:app_mode_app_support",
"//chrome:strings", "//chrome:strings",
"//chrome/common:app_mode_app_support",
] ]
} }

@@ -137,13 +137,13 @@ source_set("browser") {
"//components/metrics:net", "//components/metrics:net",
"//components/metrics:profiler", "//components/metrics:profiler",
"//components/metrics:profiler_content", "//components/metrics:profiler_content",
"//components/metrics/proto:proto",
"//components/metrics:ui", "//components/metrics:ui",
"//components/metrics/proto:proto",
"//components/metrics_services_manager", "//components/metrics_services_manager",
"//components/mime_util", "//components/mime_util",
"//components/navigation_metrics", "//components/navigation_metrics",
"//components/ntp_snippets",
"//components/network_time", "//components/network_time",
"//components/ntp_snippets",
"//components/offline_pages", "//components/offline_pages",
"//components/omnibox/browser", "//components/omnibox/browser",
"//components/os_crypt", "//components/os_crypt",
@@ -180,9 +180,9 @@ source_set("browser") {
"//components/variations", "//components/variations",
"//components/variations/net", "//components/variations/net",
"//components/variations/service", "//components/variations/service",
"//components/web_resource",
"//components/webdata/common", "//components/webdata/common",
"//components/webdata_services", "//components/webdata_services",
"//components/web_resource",
"//content/public/browser", "//content/public/browser",
"//content/public/common", "//content/public/common",
"//courgette:courgette_lib", "//courgette:courgette_lib",
@@ -194,8 +194,8 @@ source_set("browser") {
"//sync", "//sync",
"//third_party/cacheinvalidation", "//third_party/cacheinvalidation",
"//third_party/icu", "//third_party/icu",
"//third_party/libxml",
"//third_party/libjingle", "//third_party/libjingle",
"//third_party/libxml",
"//third_party/widevine/cdm:version_h", "//third_party/widevine/cdm:version_h",
"//third_party/zlib", "//third_party/zlib",
"//third_party/zlib:minizip", "//third_party/zlib:minizip",
@@ -205,9 +205,9 @@ source_set("browser") {
"//ui/gfx", "//ui/gfx",
"//ui/gfx/geometry", "//ui/gfx/geometry",
"//ui/message_center", "//ui/message_center",
"//ui/resources",
"//ui/shell_dialogs", "//ui/shell_dialogs",
"//ui/strings", "//ui/strings",
"//ui/resources",
] ]
data_deps = [] data_deps = []
@@ -657,8 +657,8 @@ source_set("browser") {
".", ".",
"//chrome") "//chrome")
deps += [ deps += [
"//printing",
"//components/printing/browser", "//components/printing/browser",
"//printing",
] ]
if (is_win) { if (is_win) {
@@ -738,9 +738,9 @@ source_set("browser") {
"//third_party/libaddressinput:util", "//third_party/libaddressinput:util",
] ]
deps -= [ deps -= [
"//third_party/libaddressinput",
"//components/storage_monitor", "//components/storage_monitor",
"//components/web_modal", "//components/web_modal",
"//third_party/libaddressinput",
] ]
defines += [ "ENABLE_DATA_REDUCTION_PROXY_DEBUGGING" ] defines += [ "ENABLE_DATA_REDUCTION_PROXY_DEBUGGING" ]
@@ -1079,6 +1079,7 @@ source_set("test_support") {
] ]
deps = [ deps = [
"//base:prefs_test_support", "//base:prefs_test_support",
"//chrome/app/theme:theme_resources",
"//chrome/browser", "//chrome/browser",
"//chrome/common", "//chrome/common",
"//chrome/common/safe_browsing:proto", "//chrome/common/safe_browsing:proto",
@@ -1089,7 +1090,6 @@ source_set("test_support") {
"//components/syncable_prefs:test_support", "//components/syncable_prefs:test_support",
"//components/user_prefs/tracked:user_prefs_tracked_test_support", "//components/user_prefs/tracked:user_prefs_tracked_test_support",
"//content/test:test_support", "//content/test:test_support",
"//chrome/app/theme:theme_resources",
"//net:test_support", "//net:test_support",
"//skia", "//skia",
"//testing/gmock", "//testing/gmock",

@@ -21,11 +21,11 @@ source_set("chromeos") {
public_deps = [ public_deps = [
"//ash/resources", "//ash/resources",
"//ash/strings", "//ash/strings",
"//chrome/app/resources:platform_locale_settings",
"//chrome/app/theme:theme_resources",
"//chrome:extra_resources", "//chrome:extra_resources",
"//chrome:resources", "//chrome:resources",
"//chrome:strings", "//chrome:strings",
"//chrome/app/resources:platform_locale_settings",
"//chrome/app/theme:theme_resources",
"//components/wallpaper", "//components/wallpaper",
"//content/app/resources", "//content/app/resources",
"//ui/chromeos/resources", "//ui/chromeos/resources",
@@ -41,12 +41,6 @@ source_set("chromeos") {
"//ash", "//ash",
"//ash:ash_with_content", "//ash:ash_with_content",
"//build/linux:fontconfig", "//build/linux:fontconfig",
"//components/drive",
"//components/flags_ui",
"//components/login",
"//components/session_manager/core",
"//components/user_manager",
"//components/wifi_sync",
"//chrome/browser/devtools", "//chrome/browser/devtools",
"//chrome/browser/extensions", "//chrome/browser/extensions",
"//chrome/browser/safe_browsing:chunk_proto", "//chrome/browser/safe_browsing:chunk_proto",
@@ -58,17 +52,23 @@ source_set("chromeos") {
"//chrome/common/safe_browsing:proto", "//chrome/common/safe_browsing:proto",
"//chrome/installer/util", "//chrome/installer/util",
"//chromeos", "//chromeos",
"//chromeos/ime:gencode",
"//chromeos:cryptohome_proto", "//chromeos:cryptohome_proto",
"//chromeos:cryptohome_signkey_proto", "//chromeos:cryptohome_signkey_proto",
"//chromeos:power_manager_proto", "//chromeos:power_manager_proto",
"//chromeos/ime:gencode",
"//components/certificate_reporting:cert_logger_proto", "//components/certificate_reporting:cert_logger_proto",
"//components/certificate_reporting:encrypted_cert_logger_proto", "//components/certificate_reporting:encrypted_cert_logger_proto",
"//components/drive",
"//components/flags_ui",
"//components/login",
"//components/onc", "//components/onc",
"//components/ownership", "//components/ownership",
"//components/pairing", "//components/pairing",
"//components/policy", "//components/policy",
"//components/proxy_config", "//components/proxy_config",
"//components/session_manager/core",
"//components/user_manager",
"//components/wifi_sync",
# This depends directly on the variations target, rather than just # This depends directly on the variations target, rather than just
# transitively via the common target because the proto sources need to # transitively via the common target because the proto sources need to
@@ -108,9 +108,9 @@ source_set("chromeos") {
"//ui/chromeos:ui_chromeos", "//ui/chromeos:ui_chromeos",
"//ui/compositor", "//ui/compositor",
"//ui/display", "//ui/display",
"//ui/events:dom_keycode_converter",
"//ui/events/devices", "//ui/events/devices",
"//ui/events/platform", "//ui/events/platform",
"//ui/events:dom_keycode_converter",
"//ui/file_manager", "//ui/file_manager",
"//ui/message_center", "//ui/message_center",
"//ui/surface", "//ui/surface",
@@ -174,8 +174,8 @@ source_set("unit_tests") {
":device_policy_proto", ":device_policy_proto",
"//ash/resources", "//ash/resources",
"//components/drive", "//components/drive",
"//components/policy",
"//components/invalidation/public", "//components/invalidation/public",
"//components/policy",
"//components/resources", "//components/resources",
"//crypto:platform", "//crypto:platform",
"//dbus", "//dbus",

@@ -67,18 +67,18 @@ static_library("devtools") {
if (!is_android) { if (!is_android) {
deps += [ deps += [
"//chrome/app/theme:theme_resources", ":webrtc_device_provider_resources",
"//chrome/common/extensions/api",
"//chrome:extra_resources", "//chrome:extra_resources",
"//chrome:resources", "//chrome:resources",
"//chrome:strings", "//chrome:strings",
"//chrome/app/theme:theme_resources",
"//chrome/common/extensions/api",
"//components/devtools_http_handler", "//components/devtools_http_handler",
"//net:http_server", "//net:http_server",
"//skia", "//skia",
"//third_party/icu", "//third_party/icu",
"//third_party/leveldatabase", "//third_party/leveldatabase",
"//third_party/libusb", "//third_party/libusb",
":webrtc_device_provider_resources",
] ]
sources += [ sources += [
"chrome_devtools_discovery_provider.cc", "chrome_devtools_discovery_provider.cc",

@@ -55,13 +55,14 @@ source_set("extensions") {
"//crypto", "//crypto",
"//device/bluetooth", "//device/bluetooth",
"//device/hid", "//device/hid",
"//extensions:extensions_resources",
"//extensions/browser", "//extensions/browser",
"//extensions/common/api", "//extensions/common/api",
"//extensions/common/api:api_registration", "//extensions/common/api:api_registration",
"//extensions/strings", "//extensions/strings",
"//extensions:extensions_resources",
"//net", "//net",
"//skia", "//skia",
"//storage/browser",
"//storage/common", "//storage/common",
"//sync", "//sync",
"//third_party/WebKit/public:image_resources", "//third_party/WebKit/public:image_resources",
@@ -80,7 +81,6 @@ source_set("extensions") {
"//ui/resources", "//ui/resources",
"//ui/strings", "//ui/strings",
"//url", "//url",
"//storage/browser",
] ]
if (is_chromeos) { if (is_chromeos) {
@@ -91,10 +91,10 @@ source_set("extensions") {
sources -= [ "api/music_manager_private/device_id_linux.cc" ] sources -= [ "api/music_manager_private/device_id_linux.cc" ]
configs += [ "//build/config/linux:dbus" ] configs += [ "//build/config/linux:dbus" ]
deps += [ deps += [
"//third_party/protobuf:protobuf_lite",
"//chromeos/ime:gencode", "//chromeos/ime:gencode",
"//components/chrome_apps", "//components/chrome_apps",
"//remoting/host/it2me:common", "//remoting/host/it2me:common",
"//third_party/protobuf:protobuf_lite",
] ]
} else { } else {
sources += [ sources += [

@@ -26,15 +26,15 @@ group("chromevox") {
#<(DEPTH)/third_party/liblouis/liblouis_nacl.gyp:liblouis_nacl_wrapper_nacl' # TODO(GYP) #<(DEPTH)/third_party/liblouis/liblouis_nacl.gyp:liblouis_nacl_wrapper_nacl' # TODO(GYP)
":chromevox_copied_files", ":chromevox_copied_files",
":chromevox_manifest",
":chromevox_guest_manifest", ":chromevox_guest_manifest",
":chromevox_manifest",
] ]
if (chromevox_compress_js) { if (chromevox_compress_js) {
deps += [ deps += [
":chromevox_background_script",
":chromevox_content_script", ":chromevox_content_script",
":chromevox_kbexplorer_script", ":chromevox_kbexplorer_script",
":chromevox_options_script", ":chromevox_options_script",
":chromevox_background_script",
":chromevox_panel_script", ":chromevox_panel_script",
] ]
} else { } else {
@@ -314,6 +314,8 @@ test("chromevox_tests") {
sources = chromevox_tests_gypi_values.chromevox_tests_sources sources = chromevox_tests_gypi_values.chromevox_tests_sources
deps = [ deps = [
":chromevox_extjs_tests",
":chromevox_unitjs_tests",
"//base", "//base",
"//base:i18n", "//base:i18n",
"//base/test:test_support", "//base/test:test_support",
@@ -328,8 +330,6 @@ test("chromevox_tests") {
"//chrome/test:test_support_ui", "//chrome/test:test_support_ui",
"//testing/gmock", "//testing/gmock",
"//testing/gtest", "//testing/gtest",
":chromevox_extjs_tests",
":chromevox_unitjs_tests",
] ]
if (cld_version == 0 || cld_version == 2) { if (cld_version == 0 || cld_version == 2) {
# Because the browser_tests use translate, they need CLD data. # Because the browser_tests use translate, they need CLD data.

@@ -117,8 +117,8 @@ source_set("ui") {
"//third_party/WebKit/public:resources", "//third_party/WebKit/public:resources",
"//third_party/adobe/flash:flapper_version_h", "//third_party/adobe/flash:flapper_version_h",
"//third_party/leveldatabase", "//third_party/leveldatabase",
"//third_party/mojo/src/mojo/edk/system",
"//third_party/libjingle", "//third_party/libjingle",
"//third_party/mojo/src/mojo/edk/system",
"//third_party/re2", "//third_party/re2",
"//ui/base/ime", "//ui/base/ime",
"//ui/compositor", "//ui/compositor",
@@ -399,9 +399,9 @@ source_set("ui") {
"//chrome/installer/util:strings", "//chrome/installer/util:strings",
"//components/search_engines", "//components/search_engines",
"//google_update", "//google_update",
"//third_party/wtl",
"//third_party/iaccessible2", "//third_party/iaccessible2",
"//third_party/isimpledom", "//third_party/isimpledom",
"//third_party/wtl",
"//ui/app_list", "//ui/app_list",
] ]
if (!is_chrome_branded) { if (!is_chrome_branded) {

@@ -92,12 +92,12 @@ component("libgtk2ui") {
deps = [ deps = [
"//base", "//base",
"//base/third_party/dynamic_annotations",
"//base:i18n", "//base:i18n",
"//chrome/app/theme:theme_resources", "//base/third_party/dynamic_annotations",
"//chrome:extra_resources", "//chrome:extra_resources",
"//chrome:resources", "//chrome:resources",
"//chrome:strings", "//chrome:strings",
"//chrome/app/theme:theme_resources",
"//components/resources", "//components/resources",
"//content/public/browser", "//content/public/browser",
"//mojo/environment:chromium", "//mojo/environment:chromium",

@@ -66,8 +66,8 @@ template("_repack_one_locale") {
deps += [ deps += [
"//content/app/strings", "//content/app/strings",
"//device/bluetooth/strings", "//device/bluetooth/strings",
"//ui/strings:ui_strings",
"//ui/strings:app_locale_settings", "//ui/strings:app_locale_settings",
"//ui/strings:ui_strings",
] ]
} }
if (enable_autofill_dialog) { if (enable_autofill_dialog) {

@@ -32,9 +32,9 @@ shared_library("chrome_watcher") {
deps = [ deps = [
":chrome_watcher_resources", ":chrome_watcher_resources",
":client", ":client",
"//chrome/installer/util",
"//base", "//base",
"//build/config/sanitizers:deps", "//build/config/sanitizers:deps",
"//chrome/installer/util",
"//components/browser_watcher", "//components/browser_watcher",
] ]
ldflags = [ "/DEF:" + rebase_path("chrome_watcher.def", root_build_dir) ] ldflags = [ "/DEF:" + rebase_path("chrome_watcher.def", root_build_dir) ]

@@ -48,9 +48,9 @@ static_library("common") {
public_deps = [ public_deps = [
"//base:base", "//base:base",
"//base:base_static",
"//base:i18n", "//base:i18n",
"//base:prefs", "//base:prefs",
"//base:base_static",
"//chrome:resources", "//chrome:resources",
"//chrome:strings", "//chrome:strings",
"//chrome/app/theme:theme_resources", "//chrome/app/theme:theme_resources",
@@ -112,16 +112,16 @@ static_library("common") {
public_deps += [ public_deps += [
":mojo_bindings", ":mojo_bindings",
"//chrome/common/net", "//chrome/common/net",
"//components/visitedlink/common",
"//components/autofill/content/common", "//components/autofill/content/common",
"//components/autofill/core/common", "//components/autofill/core/common",
"//components/password_manager/content/common", "//components/password_manager/content/common",
"//components/password_manager/core/common", "//components/password_manager/core/common",
"//components/signin/core/common", "//components/signin/core/common",
"//components/translate/content/common", "//components/translate/content/common",
"//components/visitedlink/common",
"//ipc",
"//media", "//media",
"//mojo/public/cpp/bindings", "//mojo/public/cpp/bindings",
"//ipc",
"//third_party/re2", "//third_party/re2",
"//third_party/widevine/cdm:version_h", "//third_party/widevine/cdm:version_h",
] ]
@@ -132,11 +132,11 @@ static_library("common") {
".", ".",
"//chrome") "//chrome")
public_deps += [ public_deps += [
"//device/usb",
"//chrome/common/extensions/api", "//chrome/common/extensions/api",
"//device/usb",
"//extensions:extensions_resources",
"//extensions/common", "//extensions/common",
"//extensions/common/api", "//extensions/common/api",
"//extensions:extensions_resources",
"//extensions/strings", "//extensions/strings",
"//media/cast:net", "//media/cast:net",
] ]
@@ -238,8 +238,8 @@ static_library("common") {
if (is_mac) { if (is_mac) {
sources -= [ "channel_info_posix.cc" ] sources -= [ "channel_info_posix.cc" ]
public_deps += [ public_deps += [
"//third_party/mach_override",
"//third_party/google_toolbox_for_mac", "//third_party/google_toolbox_for_mac",
"//third_party/mach_override",
] ]
} }

@@ -32,8 +32,8 @@ source_set("lib") {
deps = [ deps = [
"//base", "//base",
"//chrome/installer/util",
"//chrome/installer/launcher_support", "//chrome/installer/launcher_support",
"//chrome/installer/util",
"//components/variations", "//components/variations",
"//google_update", "//google_update",
] ]

@@ -38,8 +38,8 @@ source_set("alternate_version_generator_lib") {
deps = [ deps = [
"//base", "//base",
"//base:base_static", "//base:base_static",
"//chrome/installer/util",
"//chrome/common:constants", "//chrome/common:constants",
"//chrome/installer/util",
] ]
} }

@@ -31,13 +31,13 @@ static_library("renderer") {
deps = [ deps = [
"//base/allocator", "//base/allocator",
"//chrome/common",
"//chrome/common:mojo_bindings",
"//chrome:resources", "//chrome:resources",
"//chrome:strings", "//chrome:strings",
"//chrome/common",
"//chrome/common:mojo_bindings",
"//components/autofill/content/renderer", "//components/autofill/content/renderer",
"//components/content_settings/content/common",
"//components/cdm/renderer", "//components/cdm/renderer",
"//components/content_settings/content/common",
"//components/data_reduction_proxy/content/common", "//components/data_reduction_proxy/content/common",
"//components/data_reduction_proxy/core/common", "//components/data_reduction_proxy/core/common",
"//components/dom_distiller/content:content_renderer", "//components/dom_distiller/content:content_renderer",

@@ -51,9 +51,9 @@ static_library("service") {
configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
deps = [ deps = [
"//base",
"//chrome:strings", "//chrome:strings",
"//chrome/common", "//chrome/common",
"//base",
"//components/cloud_devices/common", "//components/cloud_devices/common",
"//google_apis", "//google_apis",
"//jingle:notifier", "//jingle:notifier",

@@ -118,10 +118,9 @@ source_set("test_support") {
"//components/sync_driver:test_support", "//components/sync_driver:test_support",
"//components/sync_sessions:test_support", "//components/sync_sessions:test_support",
"//components/syncable_prefs:test_support", "//components/syncable_prefs:test_support",
"//components/update_client:test_support",
"//components/ui/zoom:test_support", "//components/ui/zoom:test_support",
"//components/update_client:test_support",
"//content/public/app:both", "//content/public/app:both",
"//ui/gfx:test_support",
"//net", "//net",
"//net:test_support", "//net:test_support",
"//skia", "//skia",
@@ -131,6 +130,7 @@ source_set("test_support") {
"//testing/gmock", "//testing/gmock",
"//testing/gtest", "//testing/gtest",
"//third_party/zlib", "//third_party/zlib",
"//ui/gfx:test_support",
"//ui/message_center:test_support", "//ui/message_center:test_support",
] ]
@@ -140,11 +140,6 @@ source_set("test_support") {
"//chrome/plugin", "//chrome/plugin",
"//chrome/renderer", "//chrome/renderer",
"//chrome/utility", "//chrome/utility",
"//content/public/child",
"//content/public/common",
"//content/public/plugin",
"//content/public/renderer",
"//content/public/utility",
"//components/autofill/core/browser:test_support", "//components/autofill/core/browser:test_support",
"//components/captive_portal:test_support", "//components/captive_portal:test_support",
"//components/guest_view/browser:test_support", "//components/guest_view/browser:test_support",
@@ -152,6 +147,11 @@ source_set("test_support") {
"//components/sessions:test_support", "//components/sessions:test_support",
"//components/user_manager:test_support", "//components/user_manager:test_support",
"//components/web_resource:test_support", "//components/web_resource:test_support",
"//content/public/child",
"//content/public/common",
"//content/public/plugin",
"//content/public/renderer",
"//content/public/utility",
"//google_apis:test_support", "//google_apis:test_support",
"//ipc:test_support", "//ipc:test_support",
"//media:test_support", "//media:test_support",
@@ -329,13 +329,13 @@ if (!is_android) {
":test_support", ":test_support",
":test_support_ui", ":test_support_ui",
"//base/allocator", "//base/allocator",
"//chrome:packed_extra_resources",
"//chrome:packed_resources",
"//chrome:resources",
"//chrome:strings",
"//chrome/browser", "//chrome/browser",
"//chrome/browser/devtools", "//chrome/browser/devtools",
"//chrome/renderer", "//chrome/renderer",
"//chrome:resources",
"//chrome:strings",
"//chrome:packed_extra_resources",
"//chrome:packed_resources",
"//components/resources", "//components/resources",
"//content/app/resources", "//content/app/resources",
"//crypto:platform", "//crypto:platform",
@@ -397,8 +397,7 @@ if (!is_android) {
# suites, it seems like one or another starts timing out too. # suites, it seems like one or another starts timing out too.
"../browser/ui/views/keyboard_access_browsertest.cc", "../browser/ui/views/keyboard_access_browsertest.cc",
] ]
sources += sources += [ "../browser/ui/libgtk2ui/select_file_dialog_interactive_uitest.cc" ]
[ "../browser/ui/libgtk2ui/select_file_dialog_interactive_uitest.cc" ]
configs += [ "//build/config/linux/gtk2:gtk2_internal_config" ] configs += [ "//build/config/linux/gtk2:gtk2_internal_config" ]
} }
} }
@@ -588,8 +587,8 @@ if (!is_android) {
"//net", "//net",
"//skia", "//skia",
"//sync", "//sync",
"//sync:test_support_sync_testserver",
"//sync:test_support_sync_fake_server", "//sync:test_support_sync_fake_server",
"//sync:test_support_sync_testserver",
"//ui/app_list:test_support", "//ui/app_list:test_support",
] ]
@@ -1323,9 +1322,9 @@ if (!is_android) {
"//sync", "//sync",
"//testing/gmock", "//testing/gmock",
"//testing/gtest", "//testing/gtest",
"//third_party/WebKit/public:blink",
"//third_party/icu", "//third_party/icu",
"//third_party/leveldatabase", "//third_party/leveldatabase",
"//third_party/WebKit/public:blink",
] ]
data_deps = [ data_deps = [
@@ -1544,10 +1543,10 @@ test("unit_tests") {
":test_support_unit", ":test_support_unit",
"//base/test:test_support", "//base/test:test_support",
"//chrome/test:test_support", "//chrome/test:test_support",
"//components/resources",
"//components/content_settings/core/test:test_support", "//components/content_settings/core/test:test_support",
"//content/test:test_support", "//components/resources",
"//content/public/app:both", "//content/public/app:both",
"//content/test:test_support",
"//crypto:platform", "//crypto:platform",
"//crypto:test_support", "//crypto:test_support",
"//net", "//net",
@@ -1589,10 +1588,10 @@ test("unit_tests") {
"//components/metrics/proto", "//components/metrics/proto",
"//components/safe_browsing_db", "//components/safe_browsing_db",
"//components/safe_json:test_support", "//components/safe_json:test_support",
"//components/webdata_services:test_support",
"//components/strings", "//components/strings",
"//device/bluetooth:mocks", "//components/webdata_services:test_support",
"//content/app/resources", "//content/app/resources",
"//device/bluetooth:mocks",
"//gpu:test_support", "//gpu:test_support",
"//media:test_support", "//media:test_support",
@@ -1722,9 +1721,9 @@ test("unit_tests") {
if (use_aura) { if (use_aura) {
sources += [ "//ui/views/controls/webview/webview_unittest.cc" ] sources += [ "//ui/views/controls/webview/webview_unittest.cc" ]
deps += [ deps += [
"//ui/wm",
"//ui/aura:test_support", "//ui/aura:test_support",
"//ui/views:test_support", "//ui/views:test_support",
"//ui/wm",
] ]
} }
if (!is_chromeos && is_linux) { if (!is_chromeos && is_linux) {
@@ -1735,8 +1734,8 @@ test("unit_tests") {
} }
if (!is_chromeos && !use_ozone && is_linux) { if (!is_chromeos && !use_ozone && is_linux) {
deps += [ deps += [
"//chrome/browser/ui/libgtk2ui",
"//build/linux:gio", "//build/linux:gio",
"//chrome/browser/ui/libgtk2ui",
] ]
} }
@@ -1942,9 +1941,9 @@ test("unit_tests") {
} }
if (!is_mac && !is_ios) { if (!is_mac && !is_ios) {
deps += [ deps += [
"//chrome/tools/convert_dict:lib",
"//chrome:packed_extra_resources", "//chrome:packed_extra_resources",
"//chrome:packed_resources", "//chrome:packed_resources",
"//chrome/tools/convert_dict:lib",
"//third_party/hunspell", "//third_party/hunspell",
] ]
} }
@@ -1976,8 +1975,8 @@ test("unit_tests") {
"//chrome") "//chrome")
deps += [ deps += [
"//chrome:other_version", "//chrome:other_version",
"//chrome_elf:blacklist_test_dll_1",
"//chrome/installer/util:strings", "//chrome/installer/util:strings",
"//chrome_elf:blacklist_test_dll_1",
"//third_party/iaccessible2", "//third_party/iaccessible2",
"//third_party/isimpledom", "//third_party/isimpledom",
"//third_party/wtl", "//third_party/wtl",
@@ -2104,12 +2103,12 @@ if (is_win || (is_linux && !is_chromeos)) {
] ]
deps = [ deps = [
":test_support", ":test_support",
"//base/test:run_all_unittests",
"//base/test:test_support",
"//breakpad:client", "//breakpad:client",
"//chrome/browser", "//chrome/browser",
"//chrome/child", "//chrome/child",
"//components/crash/core/common", "//components/crash/core/common",
"//base/test:run_all_unittests",
"//base/test:test_support",
] ]
if (cld_version == 2) { if (cld_version == 2) {
# Use whatever CLD2 data access mode that the # Use whatever CLD2 data access mode that the

@@ -22,11 +22,11 @@ android_library("chrome_java_test_support") {
"//content/public/test/android:content_java_test_support", "//content/public/test/android:content_java_test_support",
"//net/android:net_java", "//net/android:net_java",
"//net/android:net_java_test_support", "//net/android:net_java_test_support",
"//sync/android:sync_java",
"//sync:sync_java_test_support", "//sync:sync_java_test_support",
"//sync/android:sync_java",
"//testing/android/reporter:reporter_java", "//testing/android/reporter:reporter_java",
"//third_party/android_tools:android_support_v7_appcompat_java",
"//third_party/android_tools:android_support_v13_java", "//third_party/android_tools:android_support_v13_java",
"//third_party/android_tools:android_support_v7_appcompat_java",
"//third_party/android_tools:legacy_http_javalib", "//third_party/android_tools:legacy_http_javalib",
"//third_party/jsr-305:jsr_305_javalib", "//third_party/jsr-305:jsr_305_javalib",
"//ui/android:ui_java", "//ui/android:ui_java",

@@ -27,6 +27,9 @@ static_library("utility") {
public_deps = [] public_deps = []
deps = [ deps = [
"//base", "//base",
"//chrome:resources",
"//chrome:strings",
"//chrome/common",
"//components/safe_json:safe_json_parser_message_filter", "//components/safe_json:safe_json_parser_message_filter",
"//components/search_engines", "//components/search_engines",
"//components/strings", "//components/strings",
@@ -36,9 +39,6 @@ static_library("utility") {
"//media", "//media",
"//skia", "//skia",
"//third_party/libxml", "//third_party/libxml",
"//chrome:resources",
"//chrome:strings",
"//chrome/common",
] ]
if (!is_android) { if (!is_android) {

@@ -203,8 +203,8 @@ repack("cast_shell_pak") {
"//content/app/resources", "//content/app/resources",
"//content/app/strings", "//content/app/strings",
"//net:net_resources", "//net:net_resources",
"//third_party/WebKit/public:resources",
"//third_party/WebKit/public:image_resources_grit", "//third_party/WebKit/public:image_resources_grit",
"//third_party/WebKit/public:resources",
"//ui/resources", "//ui/resources",
"//ui/strings", "//ui/strings",
] ]

@@ -62,8 +62,8 @@ source_set("browser") {
deps = [ deps = [
"//base", "//base",
"//base:prefs",
"//base:i18n", "//base:i18n",
"//base:prefs",
"//cc", "//cc",
"//chromecast/app:chromecast_settings", "//chromecast/app:chromecast_settings",
"//chromecast/app:resources", "//chromecast/app:resources",
@@ -92,8 +92,8 @@ source_set("browser") {
"//content/public/common", "//content/public/common",
"//content/public/utility", "//content/public/utility",
"//gpu", "//gpu",
"//media",
"//ipc", "//ipc",
"//media",
"//net", "//net",
"//ui/aura", "//ui/aura",
"//ui/base", "//ui/base",

@@ -22,8 +22,8 @@ source_set("metrics") {
"//components/metrics:gpu", "//components/metrics:gpu",
"//components/metrics:net", "//components/metrics:net",
"//components/metrics:profiler", "//components/metrics:profiler",
"//content/public/common",
"//content/public/browser", "//content/public/browser",
"//content/public/common",
] ]
if (is_linux) { if (is_linux) {

@@ -38,6 +38,11 @@ test("cast_media_unittests") {
deps = [ deps = [
":media", ":media",
"//base",
"//base:i18n",
"//base/test:test_support",
"//chromecast/base",
"//chromecast/base/metrics:test_support",
"//chromecast/media/audio", "//chromecast/media/audio",
"//chromecast/media/base:message_loop", "//chromecast/media/base:message_loop",
"//chromecast/media/cma/backend", "//chromecast/media/cma/backend",
@@ -45,11 +50,6 @@ test("cast_media_unittests") {
"//chromecast/media/cma/ipc", "//chromecast/media/cma/ipc",
"//chromecast/media/cma/ipc_streamer", "//chromecast/media/cma/ipc_streamer",
"//chromecast/media/cma/pipeline", "//chromecast/media/cma/pipeline",
"//base",
"//base:i18n",
"//base/test:test_support",
"//chromecast/base",
"//chromecast/base/metrics:test_support",
"//chromecast/public", "//chromecast/public",
"//media", "//media",
"//media/base:test_support", "//media/base:test_support",

@@ -30,10 +30,10 @@ source_set("pipeline") {
deps = [ deps = [
"//base", "//base",
"//chromecast/media/cma/backend",
"//chromecast/media/cma/base",
"//chromecast/media/base", "//chromecast/media/base",
"//chromecast/media/cdm", "//chromecast/media/cdm",
"//chromecast/media/cma/backend",
"//chromecast/media/cma/base",
"//crypto", "//crypto",
"//crypto:platform", "//crypto:platform",
"//media", "//media",

@@ -33,8 +33,8 @@ source_set("renderer") {
deps = [ deps = [
"//base", "//base",
"//chromecast/base", "//chromecast/base",
"//chromecast/crash",
"//chromecast/common/media", "//chromecast/common/media",
"//chromecast/crash",
"//chromecast/media", "//chromecast/media",
"//components/cdm/renderer", "//components/cdm/renderer",
"//components/network_hints/renderer", "//components/network_hints/renderer",

@@ -20,14 +20,16 @@ component("chromeos") {
"//dbus", "//dbus",
] ]
deps = [ deps = [
":cryptohome_proto",
":power_manager_proto",
"//base", "//base",
"//base:i18n", "//base:i18n",
"//base:prefs", "//base:prefs",
"//base/third_party/dynamic_annotations", "//base/third_party/dynamic_annotations",
"//chromeos/ime:gencode", "//chromeos/ime:gencode",
"//components/device_event_log", "//components/device_event_log",
"//components/policy/proto",
"//components/onc", "//components/onc",
"//components/policy/proto",
"//components/proxy_config", "//components/proxy_config",
"//components/signin/core/account_id", "//components/signin/core/account_id",
"//crypto", "//crypto",
@@ -37,8 +39,6 @@ component("chromeos") {
"//third_party/libxml", "//third_party/libxml",
"//third_party/protobuf:protobuf_lite", "//third_party/protobuf:protobuf_lite",
"//url", "//url",
":cryptohome_proto",
":power_manager_proto",
] ]
sources = gypi_values.chromeos_sources sources = gypi_values.chromeos_sources
defines = [ "CHROMEOS_IMPLEMENTATION" ] defines = [ "CHROMEOS_IMPLEMENTATION" ]
@@ -109,10 +109,10 @@ static_library("test_support_without_gmock") {
testonly = true testonly = true
configs += [ "//build/config/linux:dbus" ] configs += [ "//build/config/linux:dbus" ]
deps = [ deps = [
"//crypto",
":chromeos", ":chromeos",
":cryptohome_proto", ":cryptohome_proto",
":power_manager_proto", ":power_manager_proto",
"//crypto",
] ]
sources = [ sources = [
"dbus/fake_cros_disks_client.cc", "dbus/fake_cros_disks_client.cc",
@@ -132,6 +132,9 @@ test("chromeos_unittests") {
"//net/third_party/nss/ssl:ssl_config", "//net/third_party/nss/ssl:ssl_config",
] ]
deps = [ deps = [
":cryptohome_proto",
":power_manager_proto",
":test_support",
"//base:prefs_test_support", "//base:prefs_test_support",
"//base/test:run_all_unittests", "//base/test:run_all_unittests",
"//base/test:test_support", "//base/test:test_support",
@@ -147,9 +150,6 @@ test("chromeos_unittests") {
"//testing/gtest", "//testing/gtest",
"//third_party/icu", "//third_party/icu",
"//url", "//url",
":cryptohome_proto",
":power_manager_proto",
":test_support",
] ]
sources = gypi_values.chromeos_test_sources sources = gypi_values.chromeos_test_sources
if (use_allocator != "none") { if (use_allocator != "none") {

@@ -79,8 +79,8 @@ executable("cloud_print_service_config") {
":config_version", ":config_version",
":exe_manifest", ":exe_manifest",
"//cloud_print/common:install_utils", "//cloud_print/common:install_utils",
"//cloud_print/service:resources",
"//cloud_print/service:lib", "//cloud_print/service:lib",
"//cloud_print/service:resources",
] ]
libs = [ "secur32.lib" ] libs = [ "secur32.lib" ]
@@ -106,8 +106,8 @@ executable("cloud_print_service_setup") {
deps = [ deps = [
":exe_manifest", ":exe_manifest",
"//cloud_print/common:install_utils", "//cloud_print/common:install_utils",
"//cloud_print/service:resources",
"//cloud_print/service:lib", "//cloud_print/service:lib",
"//cloud_print/service:resources",
] ]
libs = [ "secur32.lib" ] libs = [ "secur32.lib" ]

@@ -47,63 +47,66 @@ group("all_components") {
"//components/history/core/browser", "//components/history/core/browser",
"//components/history/core/common", "//components/history/core/common",
"//components/history/core/test", "//components/history/core/test",
"//components/infobars/core",
"//components/invalidation/impl",
"//components/invalidation/public",
"//components/keyed_service/core", "//components/keyed_service/core",
"//components/leveldb_proto",
"//components/metrics", "//components/metrics",
"//components/net_log", "//components/net_log",
"//components/network_time", "//components/network_time",
"//components/ntp_snippets", "//components/ntp_snippets",
"//components/omnibox/browser",
"//components/open_from_clipboard",
"//components/os_crypt",
"//components/password_manager/core/browser", "//components/password_manager/core/browser",
"//components/password_manager/core/common", "//components/password_manager/core/common",
"//components/password_manager/sync/browser", "//components/password_manager/sync/browser",
"//components/pref_registry",
"//components/proxy_config",
"//components/rappor",
"//components/search", "//components/search",
"//components/search_engines", "//components/search_engines",
"//components/sessions", "//components/sessions",
"//components/sync_bookmarks",
"//components/undo",
"//components/update_client",
"//components/strings",
"//components/leveldb_proto",
"//components/pref_registry",
"//components/rappor",
"//components/proxy_config",
"//components/omnibox/browser",
"//components/open_from_clipboard",
"//components/infobars/core",
"//components/invalidation/impl",
"//components/invalidation/public",
"//components/signin/core/browser", "//components/signin/core/browser",
"//components/strings",
"//components/suggestions", "//components/suggestions",
"//components/sync_bookmarks",
"//components/sync_driver", "//components/sync_driver",
"//components/syncable_prefs", "//components/syncable_prefs",
"//components/translate/core/browser", "//components/translate/core/browser",
"//components/translate/core/common", "//components/translate/core/common",
"//components/undo",
"//components/update_client",
"//components/upload_list", "//components/upload_list",
"//components/variations", "//components/variations",
"//components/variations/service", "//components/variations/service",
"//components/version_info", "//components/version_info",
"//components/version_ui", "//components/version_ui",
"//components/os_crypt",
"//components/web_resource", "//components/web_resource",
"//components/webdata_services", "//components/webdata_services",
] ]
if (!is_ios) { if (!is_ios) {
deps += [ deps += [
"//components/bitmap_uploader",
"//components/certificate_reporting",
"//components/cdm/browser",
"//components/about_handler", "//components/about_handler",
"//components/app_modal",
"//components/auto_login_parser", "//components/auto_login_parser",
"//components/autofill/content/browser", "//components/autofill/content/browser",
"//components/autofill/content/common", "//components/autofill/content/common",
"//components/autofill/content/renderer", "//components/autofill/content/renderer",
"//components/bitmap_uploader",
"//components/browsing_data",
"//components/bubble", "//components/bubble",
"//components/captive_portal", "//components/captive_portal",
"//components/cdm/browser", "//components/cdm/browser",
"//components/cdm/browser",
"//components/cdm/common", "//components/cdm/common",
"//components/cdm/renderer", "//components/cdm/renderer",
"//components/cloud_devices/common", "//components/certificate_reporting",
"//components/certificate_transparency",
"//components/chrome_apps", "//components/chrome_apps",
"//components/cloud_devices/common",
"//components/compression", "//components/compression",
"//components/cookie_config", "//components/cookie_config",
"//components/crash/content/app", "//components/crash/content/app",
@@ -120,6 +123,9 @@ group("all_components") {
"//components/feedback", "//components/feedback",
"//components/gcm_driver/crypto", "//components/gcm_driver/crypto",
"//components/gcm_driver/instance_id", "//components/gcm_driver/instance_id",
"//components/guest_view/browser",
"//components/guest_view/common",
"//components/guest_view/renderer",
"//components/history/content/browser", "//components/history/content/browser",
"//components/json_schema", "//components/json_schema",
"//components/keyed_service/content", "//components/keyed_service/content",
@@ -143,18 +149,21 @@ group("all_components") {
"//components/pdf/renderer", "//components/pdf/renderer",
"//components/plugins/renderer", "//components/plugins/renderer",
"//components/power", "//components/power",
"//components/precache/core",
"//components/precache/content", "//components/precache/content",
"//components/precache/core",
"//components/query_parser", "//components/query_parser",
"//components/renderer_context_menu", "//components/renderer_context_menu",
"//components/resources:components_resources", "//components/resources:components_resources",
"//components/safe_browsing_db", "//components/safe_browsing_db",
"//components/safe_json",
"//components/scheduler",
"//components/search_provider_logos", "//components/search_provider_logos",
"//components/security_interstitials/core", "//components/security_interstitials/core",
"//components/ssl_config", "//components/ssl_config",
"//components/startup_metric_utils/common",
"//components/startup_metric_utils/browser", "//components/startup_metric_utils/browser",
"//components/startup_metric_utils/common",
"//components/sync_sessions", "//components/sync_sessions",
"//components/test_runner",
"//components/tracing", "//components/tracing",
"//components/tracing:startup_tracing", "//components/tracing:startup_tracing",
"//components/translate/content/browser", "//components/translate/content/browser",
@@ -175,19 +184,10 @@ group("all_components") {
"//components/web_cache/renderer", "//components/web_cache/renderer",
"//components/web_modal", "//components/web_modal",
"//components/webcrypto", "//components/webcrypto",
"//components/webcrypto",
"//components/webdata/common", "//components/webdata/common",
"//components/wifi", "//components/wifi",
"//components/wifi_sync", "//components/wifi_sync",
"//components/app_modal",
"//components/browsing_data",
"//components/certificate_transparency",
"//components/guest_view/browser",
"//components/guest_view/common",
"//components/guest_view/renderer",
"//components/safe_json",
"//components/scheduler",
"//components/test_runner",
"//components/webcrypto",
] ]
if (enable_configuration_policy) { if (enable_configuration_policy) {
@@ -210,11 +210,11 @@ group("all_components") {
# TODO(agrieve): Add to main deps list once compile errors are resolved. # TODO(agrieve): Add to main deps list once compile errors are resolved.
deps += [ deps += [
"//components/audio_modem", "//components/audio_modem",
"//components/copresence",
"//components/proximity_auth", "//components/proximity_auth",
"//components/proximity_auth/cryptauth", "//components/proximity_auth/cryptauth",
"//components/webusb",
"//components/copresence",
"//components/storage_monitor", "//components/storage_monitor",
"//components/webusb",
] ]
} }
@@ -261,13 +261,13 @@ group("all_components") {
"//components/autofill/content/browser", # Blocked on content/blink. "//components/autofill/content/browser", # Blocked on content/blink.
"//components/autofill/content/common", # Blocked on content. "//components/autofill/content/common", # Blocked on content.
"//components/autofill/content/renderer", # Blocked on content/blink. "//components/autofill/content/renderer", # Blocked on content/blink.
"//components/crash/content/app", # Should work, needs checking.
"//components/crash/content/browser", # Should work, needs checking.
"//components/captive_portal", # Should work, needs checking. "//components/captive_portal", # Should work, needs checking.
"//components/cloud_devices/common", # Should work, needs checking.
"//components/cdm/browser", # Blocked on content. "//components/cdm/browser", # Blocked on content.
"//components/cdm/common", # Blocked on content. "//components/cdm/common", # Blocked on content.
"//components/cdm/renderer", # Blocked on content. "//components/cdm/renderer", # Blocked on content.
"//components/cloud_devices/common", # Should work, needs checking.
"//components/crash/content/app", # Should work, needs checking.
"//components/crash/content/browser", # Should work, needs checking.
"//components/data_reduction_proxy/core/browser", # Should work, needs checking. "//components/data_reduction_proxy/core/browser", # Should work, needs checking.
"//components/data_reduction_proxy/core/common", # Should work, needs checking. "//components/data_reduction_proxy/core/common", # Should work, needs checking.
"//components/dom_distiller/core", # Blocked on content. "//components/dom_distiller/core", # Blocked on content.
@@ -283,16 +283,16 @@ group("all_components") {
"//components/invalidation/impl", # Should work, needs checking. "//components/invalidation/impl", # Should work, needs checking.
"//components/invalidation/public", # Should work, needs checking. "//components/invalidation/public", # Should work, needs checking.
"//components/json_schema", # Should work, needs checking. "//components/json_schema", # Should work, needs checking.
"//components/keyed_service/core", # Blocked on content.
"//components/keyed_service/content", # Blocked on content. "//components/keyed_service/content", # Blocked on content.
"//components/keyed_service/core", # Blocked on content.
"//components/navigation_interception", # Blocked on content. "//components/navigation_interception", # Blocked on content.
"//components/omnibox/browser", # Should work, needs checking. "//components/omnibox/browser", # Should work, needs checking.
"//components/password_manager/content/browser", # Blocked on content. "//components/password_manager/content/browser", # Blocked on content.
"//components/password_manager/core/browser", # Should work, needs checking. "//components/password_manager/core/browser", # Should work, needs checking.
"//components/password_manager/core/common", # Should work, needs checking. "//components/password_manager/core/common", # Should work, needs checking.
"//components/plugins/renderer", # Blocked on blink. "//components/plugins/renderer", # Blocked on blink.
"//components/power", # Blocked on content.
"//components/policy", # Blocked on content (indirectly via autofill). "//components/policy", # Blocked on content (indirectly via autofill).
"//components/power", # Blocked on content.
"//components/precache/content", # Blocked on content. "//components/precache/content", # Blocked on content.
"//components/precache/core", # Should work, needs checking. "//components/precache/core", # Should work, needs checking.
"//components/rappor", # Should work, needs checking. "//components/rappor", # Should work, needs checking.
@@ -310,8 +310,8 @@ group("all_components") {
"//components/visitedlink/renderer", # Blocked on blink "//components/visitedlink/renderer", # Blocked on blink
"//components/web_cache/browser", # Blocked on content and blink. "//components/web_cache/browser", # Blocked on content and blink.
"//components/web_cache/renderer", # Blocked on content and blink. "//components/web_cache/renderer", # Blocked on content and blink.
"//components/webdata_services", # Should work, needs checking.
"//components/web_modal", # Blocked on content. "//components/web_modal", # Blocked on content.
"//components/webdata_services", # Should work, needs checking.
] ]
} }
} }
@@ -369,75 +369,63 @@ test("components_unittests") {
"//components/history/core/common:unit_tests", "//components/history/core/common:unit_tests",
"//components/invalidation/impl:unit_tests", "//components/invalidation/impl:unit_tests",
"//components/keyed_service/core:unit_tests", "//components/keyed_service/core:unit_tests",
"//components/leveldb_proto:unit_tests",
"//components/metrics:unit_tests", "//components/metrics:unit_tests",
"//components/net_log:unit_tests", "//components/net_log:unit_tests",
"//components/network_time:unit_tests", "//components/network_time:unit_tests",
"//components/omnibox/browser:unit_tests",
"//components/open_from_clipboard:unit_tests", "//components/open_from_clipboard:unit_tests",
"//components/os_crypt:unit_tests",
"//components/password_manager/core/browser:unit_tests", "//components/password_manager/core/browser:unit_tests",
"//components/password_manager/core/common:unit_tests", "//components/password_manager/core/common:unit_tests",
"//components/password_manager/sync/browser:unit_tests", "//components/password_manager/sync/browser:unit_tests",
"//components/proxy_config:unit_tests", "//components/proxy_config:unit_tests",
"//components/rappor:unit_tests", "//components/rappor:unit_tests",
"//components/search:unit_tests", "//components/search:unit_tests",
"//components/sessions:unit_tests",
"//components/syncable_prefs:unit_tests",
"//components/undo:unit_tests",
"//components/update_client:unit_tests",
"//components/upload_list:unit_tests",
"//net",
"//ui/base",
"//ui/resources:ui_test_pak",
"//components/search_engines:unit_tests", "//components/search_engines:unit_tests",
"//components/leveldb_proto:unit_tests", "//components/sessions:unit_tests",
"//components/signin/core/browser:unit_tests", "//components/signin/core/browser:unit_tests",
"//components/suggestions:unit_tests", "//components/suggestions:unit_tests",
"//components/sync_driver:unit_tests", "//components/sync_driver:unit_tests",
"//components/syncable_prefs:unit_tests",
"//components/translate/core/browser:unit_tests", "//components/translate/core/browser:unit_tests",
"//components/translate/core/common:unit_tests", "//components/translate/core/common:unit_tests",
"//components/translate/core/language_detection:unit_tests", "//components/translate/core/language_detection:unit_tests",
"//components/undo:unit_tests",
"//components/update_client:unit_tests",
"//components/upload_list:unit_tests",
"//components/variations:unit_tests", "//components/variations:unit_tests",
"//components/variations/service:unit_tests", "//components/variations/service:unit_tests",
"//components/omnibox/browser:unit_tests",
"//components/os_crypt:unit_tests",
"//components/web_resource:unit_tests", "//components/web_resource:unit_tests",
"//net",
"//ui/base",
"//ui/resources:ui_test_pak",
] ]
if (!is_ios) { if (!is_ios) {
deps += [ deps += [
"//components/certificate_transparency:unit_tests",
"//components/data_use_measurement/content:unit_tests",
"//components/error_page/renderer:unit_tests",
"//components/guest_view/browser:unit_tests",
"//components/navigation_interception:unit_tests",
"//components/network_hints/renderer:unit_tests",
"//components/page_load_metrics/browser:unit_tests",
"//components/page_load_metrics/renderer:unit_tests",
"//components/power:unit_tests",
"//components/safe_json:unit_tests",
"//components/scheduler:unit_tests",
"//components/test_runner:test_runner",
"//components/tracing:unit_tests",
"//components/ui/zoom:unit_tests",
"//components/visitedlink/test:unit_tests",
"//components/web_cache/browser:unit_tests",
"//components/auto_login_parser:unit_tests", "//components/auto_login_parser:unit_tests",
"//components/autofill/content/browser:unit_tests", "//components/autofill/content/browser:unit_tests",
"//components/autofill/content/renderer:unit_tests", "//components/autofill/content/renderer:unit_tests",
"//components/bubble:unit_tests", "//components/bubble:unit_tests",
"//components/captive_portal:unit_tests", "//components/captive_portal:unit_tests",
"//components/certificate_transparency:unit_tests",
"//components/cloud_devices/common:unit_tests", "//components/cloud_devices/common:unit_tests",
"//components/component_updater:unit_tests", "//components/component_updater:unit_tests",
"//components/crx_file:unit_tests", "//components/crx_file:unit_tests",
"//components/data_reduction_proxy/content/browser:unit_tests", "//components/data_reduction_proxy/content/browser:unit_tests",
"//components/data_reduction_proxy/core/browser:unit_tests", "//components/data_reduction_proxy/core/browser:unit_tests",
"//components/data_reduction_proxy/core/common:unit_tests", "//components/data_reduction_proxy/core/common:unit_tests",
"//components/data_use_measurement/content:unit_tests",
"//components/device_event_log:unit_tests", "//components/device_event_log:unit_tests",
"//components/devtools_http_handler:unit_tests", "//components/devtools_http_handler:unit_tests",
"//components/dom_distiller/content:unit_tests", "//components/dom_distiller/content:unit_tests",
"//components/domain_reliability:unit_tests", "//components/domain_reliability:unit_tests",
"//components/error_page/renderer:unit_tests",
"//components/favicon/content:unit_tests", "//components/favicon/content:unit_tests",
"//components/gcm_driver/crypto:unit_tests", "//components/gcm_driver/crypto:unit_tests",
"//components/gcm_driver/instance_id:unit_tests", "//components/gcm_driver/instance_id:unit_tests",
"//components/guest_view/browser:unit_tests",
"//components/history/content/browser:unit_tests", "//components/history/content/browser:unit_tests",
"//components/json_schema:unit_tests", "//components/json_schema:unit_tests",
"//components/keyed_service/content:unit_tests", "//components/keyed_service/content:unit_tests",
@@ -445,23 +433,35 @@ test("components_unittests") {
"//components/login:unit_tests", "//components/login:unit_tests",
"//components/memory_pressure:unit_tests", "//components/memory_pressure:unit_tests",
"//components/mime_util:unit_tests", "//components/mime_util:unit_tests",
"//components/navigation_interception:unit_tests",
"//components/network_hints/renderer:unit_tests",
"//components/offline_pages:unit_tests", "//components/offline_pages:unit_tests",
"//components/packed_ct_ev_whitelist:unit_tests", "//components/packed_ct_ev_whitelist:unit_tests",
"//components/page_load_metrics/browser:unit_tests",
"//components/page_load_metrics/renderer:unit_tests",
"//components/password_manager/content/browser:unit_tests", "//components/password_manager/content/browser:unit_tests",
"//components/power:unit_tests",
"//components/precache/content:unit_tests", "//components/precache/content:unit_tests",
"//components/precache/core:unit_tests", "//components/precache/core:unit_tests",
"//components/query_parser:unit_tests", "//components/query_parser:unit_tests",
"//components/safe_browsing_db:unit_tests", "//components/safe_browsing_db:unit_tests",
"//components/search_engines:unit_tests", "//components/safe_json:unit_tests",
"//components/scheduler:unit_tests",
"//components/search:unit_tests", "//components/search:unit_tests",
"//components/search_engines:unit_tests",
"//components/search_provider_logos:unit_tests", "//components/search_provider_logos:unit_tests",
"//components/ssl_config:unit_tests", "//components/ssl_config:unit_tests",
"//components/sync_bookmarks:unit_tests", "//components/sync_bookmarks:unit_tests",
"//components/sync_sessions:unit_tests", "//components/sync_sessions:unit_tests",
"//components/test_runner:test_runner",
"//components/tracing:unit_tests",
"//components/ui/zoom:unit_tests",
"//components/url_formatter:unit_tests", "//components/url_formatter:unit_tests",
"//components/url_matcher:unit_tests", "//components/url_matcher:unit_tests",
"//components/user_prefs/tracked:unit_tests", "//components/user_prefs/tracked:unit_tests",
"//components/visitedlink/test:unit_tests",
"//components/wallpaper:unit_tests", "//components/wallpaper:unit_tests",
"//components/web_cache/browser:unit_tests",
"//components/webcrypto:unit_tests", "//components/webcrypto:unit_tests",
"//components/webdata/common:unit_tests", "//components/webdata/common:unit_tests",
@@ -648,14 +648,19 @@ test("components_browsertests") {
defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ] defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
deps = [ deps = [
"strings",
"//base", "//base",
"//base/test:test_support", "//base/test:test_support",
"//testing/gmock", "//testing/gmock",
"//testing/gtest", "//testing/gtest",
"strings",
] ]
if (!is_ios) { if (!is_ios) {
deps += [ deps += [
"//components/tracing",
"//content/test:browsertest_support",
"//content/test:test_support",
"//device/bluetooth",
"//ui/base",
"autofill/content/browser", "autofill/content/browser",
"autofill/content/renderer", "autofill/content/renderer",
"content_settings/core/common", "content_settings/core/common",
@@ -665,11 +670,6 @@ test("components_browsertests") {
"password_manager/content/browser", "password_manager/content/browser",
"password_manager/content/common", "password_manager/content/common",
"password_manager/content/renderer", "password_manager/content/renderer",
"//components/tracing",
"//content/test:browsertest_support",
"//content/test:test_support",
"//device/bluetooth",
"//ui/base",
] ]
data_deps = [ data_deps = [
@@ -697,8 +697,8 @@ test("components_browsertests") {
# a MANUAL component_browsertest. # a MANUAL component_browsertest.
sources += [ "dom_distiller/standalone/content_extractor_browsertest.cc" ] sources += [ "dom_distiller/standalone/content_extractor_browsertest.cc" ]
deps += [ deps += [
"pref_registry:test_support",
"//base:prefs_test_support", "//base:prefs_test_support",
"pref_registry:test_support",
] ]
} }
@@ -727,8 +727,8 @@ test("components_perftests") {
deps += [ deps += [
"//base", "//base",
"//base/test:test_support_perf", "//base/test:test_support_perf",
"//content/test:test_support",
"//components/visitedlink/browser", "//components/visitedlink/browser",
"//content/test:test_support",
] ]
} }
} }

@@ -78,8 +78,8 @@ source_set("unit_tests") {
deps = [ deps = [
":browser", ":browser",
"//base", "//base",
"//components/autofill/content/common",
"//components/autofill/content/browser/wallet:test_support", "//components/autofill/content/browser/wallet:test_support",
"//components/autofill/content/common",
"//components/autofill/core/browser", "//components/autofill/core/browser",
"//components/autofill/core/browser:test_support", "//components/autofill/core/browser:test_support",
"//components/autofill/core/common", "//components/autofill/core/common",

@@ -35,8 +35,8 @@ static_library("renderer") {
"//ipc", "//ipc",
"//net", "//net",
"//skia", "//skia",
"//third_party/icu",
"//third_party/WebKit/public:blink", "//third_party/WebKit/public:blink",
"//third_party/icu",
"//ui/base", "//ui/base",
] ]

@@ -157,7 +157,6 @@ source_set("browser") {
"//base", "//base",
"//base:i18n", "//base:i18n",
"//base:prefs", "//base:prefs",
"//third_party/re2",
"//components/autofill/core/common", "//components/autofill/core/common",
"//components/compression", "//components/compression",
"//components/data_use_measurement/core", "//components/data_use_measurement/core",
@@ -181,8 +180,9 @@ source_set("browser") {
"//third_party/fips181", "//third_party/fips181",
"//third_party/icu", "//third_party/icu",
"//third_party/libaddressinput:util", "//third_party/libaddressinput:util",
"//third_party/libphonenumber",
"//third_party/libjingle", "//third_party/libjingle",
"//third_party/libphonenumber",
"//third_party/re2",
"//ui/base", "//ui/base",
"//ui/gfx", "//ui/gfx",
"//ui/gfx/geometry", "//ui/gfx/geometry",
@@ -218,10 +218,11 @@ source_set("test_support") {
] ]
deps = [ deps = [
":browser",
"//base", "//base",
"//base/test:test_support",
"//base:prefs", "//base:prefs",
"//base:prefs_test_support", "//base:prefs_test_support",
"//base/test:test_support",
"//components/autofill/core/browser", "//components/autofill/core/browser",
"//components/autofill/core/common", "//components/autofill/core/common",
"//components/os_crypt", "//components/os_crypt",
@@ -233,9 +234,8 @@ source_set("test_support") {
"//google_apis:test_support", "//google_apis:test_support",
"//skia", "//skia",
"//testing/gtest", "//testing/gtest",
"//ui/gfx/geometry",
"//ui/gfx:test_support", "//ui/gfx:test_support",
":browser", "//ui/gfx/geometry",
] ]
} }
@@ -309,8 +309,8 @@ source_set("unit_tests") {
"//testing/gmock", "//testing/gmock",
"//testing/gtest", "//testing/gtest",
"//third_party/libaddressinput:util", "//third_party/libaddressinput:util",
"//third_party/libphonenumber",
"//third_party/libjingle", "//third_party/libjingle",
"//third_party/libphonenumber",
"//ui/base", "//ui/base",
"//url", "//url",
] ]

@@ -23,11 +23,11 @@ source_set("browser") {
] ]
deps = [ deps = [
":injected_js",
"//components/autofill/core/browser", "//components/autofill/core/browser",
"//components/autofill/core/common", "//components/autofill/core/common",
"//ios/public/provider/web", "//ios/public/provider/web",
"//ios/web", "//ios/web",
":injected_js",
] ]
} }

@@ -12,8 +12,8 @@ source_set("bitmap_uploader") {
deps = [ deps = [
"//base", "//base",
"//components/mus/public/interfaces",
"//components/mus/public/cpp", "//components/mus/public/cpp",
"//components/mus/public/interfaces",
"//gpu", "//gpu",
"//mojo/converters/surfaces", "//mojo/converters/surfaces",
"//mojo/public/c/gles2", "//mojo/public/c/gles2",

@@ -27,10 +27,10 @@ source_set("browser") {
"//components/pref_registry", "//components/pref_registry",
"//components/signin/core/browser", "//components/signin/core/browser",
"//components/strings", "//components/strings",
"//components/syncable_prefs",
"//components/sync_bookmarks", "//components/sync_bookmarks",
"//components/sync_driver", "//components/sync_driver",
"//components/sync_sessions", "//components/sync_sessions",
"//components/syncable_prefs",
"//components/variations", "//components/variations",
"//components/version_info", "//components/version_info",
"//components/version_info:generate_version_info", "//components/version_info:generate_version_info",

@@ -12,7 +12,7 @@ source_set("common") {
deps = [ deps = [
"//base", "//base",
"//content/public/common", "//content/public/common",
"//media",
"//ipc", "//ipc",
"//media",
] ]
} }

@@ -22,8 +22,8 @@ component("chrome_apps") {
"chrome_apps_resource_util.h", "chrome_apps_resource_util.h",
] ]
deps = [ deps = [
"//base",
":resources", ":resources",
"//base",
] ]
defines = [ "CHROME_APPS_IMPLEMENTATION" ] defines = [ "CHROME_APPS_IMPLEMENTATION" ]
} }

@@ -44,7 +44,7 @@ source_set("unit_tests") {
"//base", "//base",
"//base/test:test_support", "//base/test:test_support",
"//components/update_client:test_support", "//components/update_client:test_support",
"//testing/gtest",
"//testing/gmock", "//testing/gmock",
"//testing/gtest",
] ]
} }

@@ -12,8 +12,8 @@ source_set("constrained_window") {
deps = [ deps = [
"//components/guest_view/browser", "//components/guest_view/browser",
"//components/web_modal", "//components/web_modal",
"//ui/views",
"//skia", "//skia",
"//ui/views",
] ]
} }

@@ -81,7 +81,7 @@ source_set("unit_tests") {
"//components/copresence/proto", "//components/copresence/proto",
"//components/gcm_driver:test_support", "//components/gcm_driver:test_support",
"//net:test_support", "//net:test_support",
"//testing/gtest",
"//testing/gmock", "//testing/gmock",
"//testing/gtest",
] ]
} }

@@ -115,8 +115,8 @@ source_set("app_non_mac") {
if (is_win) { if (is_win) {
deps += [ deps += [
"//sandbox",
"//breakpad:breakpad_handler", "//breakpad:breakpad_handler",
"//sandbox",
#'../breakpad/breakpad.gyp:breakpad_sender', TODO(GYP) #'../breakpad/breakpad.gyp:breakpad_sender', TODO(GYP)
] ]

@@ -27,9 +27,9 @@ source_set("unit_tests") {
"objc_zombie_unittest.mm", "objc_zombie_unittest.mm",
] ]
deps = [ deps = [
":common",
"//base", "//base",
"//testing/gtest", "//testing/gtest",
":common",
] ]
} }
} }

@@ -58,8 +58,8 @@ source_set("unit_tests") {
"//content/public/common", "//content/public/common",
"//content/test:test_support", "//content/test:test_support",
"//net:test_support", "//net:test_support",
"//testing/gtest",
"//testing/gmock", "//testing/gmock",
"//testing/gtest",
] ]
if (is_android) { if (is_android) {

@@ -110,7 +110,6 @@ source_set("drive") {
# TODO(lukasza): Remove this dependency (see DEPS file for more info). # TODO(lukasza): Remove this dependency (see DEPS file for more info).
"//content/public/browser", "//content/public/browser",
"//google_apis:google_apis", "//google_apis:google_apis",
"//net:net", "//net:net",
"//third_party/cacheinvalidation", "//third_party/cacheinvalidation",

@@ -28,8 +28,8 @@ source_set("unit_tests") {
] ]
deps = [ deps = [
":wayland",
"//testing/gtest", "//testing/gtest",
"//third_party/wayland:wayland_client", "//third_party/wayland:wayland_client",
":wayland",
] ]
} }

@@ -28,9 +28,9 @@ source_set("feedback") {
deps = [ deps = [
"//base", "//base",
"//components/keyed_service/core",
"//components/keyed_service/content",
"//components/feedback/proto", "//components/feedback/proto",
"//components/keyed_service/content",
"//components/keyed_service/core",
"//components/variations/net", "//components/variations/net",
"//content/public/browser", "//content/public/browser",
"//content/public/common", "//content/public/common",

@@ -58,7 +58,6 @@ static_library("gcm_driver") {
] ]
deps = [ deps = [
"crypto",
"//base", "//base",
"//components/gcm_driver/common", "//components/gcm_driver/common",
"//components/os_crypt", "//components/os_crypt",
@@ -67,6 +66,7 @@ static_library("gcm_driver") {
"//net", "//net",
"//sync/protocol", "//sync/protocol",
"//url:url", "//url:url",
"crypto",
] ]
if (is_chromeos) { if (is_chromeos) {

@@ -24,12 +24,12 @@ source_set("crypto") {
] ]
deps = [ deps = [
"proto",
"//base", "//base",
"//components/leveldb_proto",
"//crypto", "//crypto",
"//crypto:platform", "//crypto:platform",
"//components/leveldb_proto",
"//third_party/protobuf:protobuf_lite", "//third_party/protobuf:protobuf_lite",
"proto",
] ]
if (use_openssl) { if (use_openssl) {

@@ -15,8 +15,8 @@ source_set("instance_id") {
deps = [ deps = [
"//base", "//base",
"//crypto",
"//components/gcm_driver", "//components/gcm_driver",
"//crypto",
] ]
if (is_android) { if (is_android) {

@@ -164,16 +164,16 @@ source_set("lib") {
"//components/resource_provider/public/interfaces", "//components/resource_provider/public/interfaces",
"//components/scheduler:scheduler", "//components/scheduler:scheduler",
"//components/startup_metric_utils/browser:lib", "//components/startup_metric_utils/browser:lib",
"//components/webcrypto",
"//components/web_view:switches", "//components/web_view:switches",
"//components/web_view/public/interfaces", "//components/web_view/public/interfaces",
"//components/webcrypto",
"//gin", "//gin",
"//gpu/command_buffer/common:gles2_utils",
"//gpu/blink:blink", "//gpu/blink:blink",
"//gpu/command_buffer/common:gles2_utils",
"//media", "//media",
"//media:shared_memory_support",
"//media/blink", "//media/blink",
"//media/mojo", "//media/mojo",
"//media:shared_memory_support",
"//mojo/application/public/cpp", "//mojo/application/public/cpp",
"//mojo/application/public/interfaces", "//mojo/application/public/interfaces",
"//mojo/common", "//mojo/common",
@@ -190,9 +190,9 @@ source_set("lib") {
"//mojo/services/tracing/public/interfaces", "//mojo/services/tracing/public/interfaces",
"//net", "//net",
"//skia", "//skia",
"//third_party/mojo_services/src/accessibility/public/interfaces",
"//third_party/WebKit/public:image_resources", "//third_party/WebKit/public:image_resources",
"//third_party/WebKit/public:resources", "//third_party/WebKit/public:resources",
"//third_party/mojo_services/src/accessibility/public/interfaces",
"//ui/base:base", "//ui/base:base",
"//ui/events", "//ui/events",
"//ui/events:gesture_detection", "//ui/events:gesture_detection",

@@ -15,8 +15,8 @@ component("login") {
defines = [ "LOGIN_IMPLEMENTATION" ] defines = [ "LOGIN_IMPLEMENTATION" ]
deps = [ deps = [
"//ui/base",
"//components/signin/core/account_id", "//components/signin/core/account_id",
"//ui/base",
] ]
public_deps = [ public_deps = [

@@ -18,11 +18,11 @@ if (is_android) {
deps = [ deps = [
":lib", ":lib",
"public/interfaces",
"//mojo/application/public/cpp:sources", "//mojo/application/public/cpp:sources",
"//mojo/public/cpp/bindings", "//mojo/public/cpp/bindings",
"//mojo/services/tracing/public/interfaces", "//mojo/services/tracing/public/interfaces",
"//mojo/shell", "//mojo/shell",
"public/interfaces",
] ]
} }
} else { } else {

@@ -28,8 +28,8 @@ executable("window_type_launcher") {
"//mojo/converters/geometry", "//mojo/converters/geometry",
"//mojo/message_pump", "//mojo/message_pump",
"//mojo/public/cpp/bindings", "//mojo/public/cpp/bindings",
"//mojo/runner/child:lib",
"//mojo/runner:init", "//mojo/runner:init",
"//mojo/runner/child:lib",
"//skia", "//skia",
"//third_party/mojo/src/mojo/edk/system", "//third_party/mojo/src/mojo/edk/system",
"//ui/aura", "//ui/aura",

@@ -29,7 +29,7 @@ mojom("interfaces") {
] ]
deps = [ deps = [
"//ui/mojo/ime:interfaces",
"//ui/mojo/geometry:interfaces", "//ui/mojo/geometry:interfaces",
"//ui/mojo/ime:interfaces",
] ]
} }

@@ -127,14 +127,14 @@ test("window_manager_unittests") {
] ]
deps = [ deps = [
":test_support",
":lib", ":lib",
":test_support",
"//base", "//base",
"//base/test:test_config", "//base/test:test_config",
"//components/mus/common", "//components/mus/common",
"//components/mus/surfaces",
"//components/mus/public/cpp", "//components/mus/public/cpp",
"//components/mus/public/interfaces", "//components/mus/public/interfaces",
"//components/mus/surfaces",
"//mojo/application/public/interfaces", "//mojo/application/public/interfaces",
"//mojo/converters/geometry", "//mojo/converters/geometry",
"//mojo/converters/input_events", "//mojo/converters/input_events",
@@ -143,13 +143,13 @@ test("window_manager_unittests") {
"//mojo/gles2", "//mojo/gles2",
"//mojo/platform_handle", "//mojo/platform_handle",
"//mojo/public/cpp/bindings:bindings", "//mojo/public/cpp/bindings:bindings",
"//third_party/mojo/src/mojo/edk/test:run_all_unittests",
"//ui/mojo/geometry:interfaces",
"//testing/gtest", "//testing/gtest",
"//third_party/mojo/src/mojo/edk/test:run_all_unittests",
"//ui/events", "//ui/events",
"//ui/gfx", "//ui/gfx",
"//ui/gfx:test_support", "//ui/gfx:test_support",
"//ui/gfx/geometry", "//ui/gfx/geometry",
"//ui/mojo/geometry:interfaces",
] ]
if (!is_android) { # TODO(GYP) Enable on Android when osmesa links. if (!is_android) { # TODO(GYP) Enable on Android when osmesa links.

@@ -144,7 +144,6 @@ if (enable_nacl) {
deps = [ deps = [
":nacl_common", ":nacl_common",
":nacl_switches", ":nacl_switches",
"renderer/plugin:nacl_trusted_plugin",
"//base", "//base",
"//content/public/common", "//content/public/common",
"//content/public/renderer", "//content/public/renderer",
@@ -154,6 +153,7 @@ if (enable_nacl) {
"//ppapi/proxy:ipc", "//ppapi/proxy:ipc",
"//ppapi/shared_impl", "//ppapi/shared_impl",
"//third_party/WebKit/public:blink", "//third_party/WebKit/public:blink",
"renderer/plugin:nacl_trusted_plugin",
] ]
} }
@@ -259,8 +259,8 @@ if (enable_nacl) {
"loader/nonsfi/nonsfi_main.h", "loader/nonsfi/nonsfi_main.h",
] ]
deps = [ deps = [
":nacl_switches",
":nacl_helper_nonsfi_sandbox", ":nacl_helper_nonsfi_sandbox",
":nacl_switches",
"//base", "//base",
"//components/tracing", "//components/tracing",
"//content", "//content",

@@ -26,9 +26,9 @@ source_set("unit_tests") {
"net_log_temp_file_unittest.cc", "net_log_temp_file_unittest.cc",
] ]
deps = [ deps = [
":net_log",
"//base", "//base",
"//net", "//net",
"//testing/gtest", "//testing/gtest",
":net_log",
] ]
} }

@@ -107,6 +107,7 @@ source_set("browser") {
"//components/metrics/proto", "//components/metrics/proto",
] ]
deps = [ deps = [
":in_memory_url_index_cache_proto",
"//base", "//base",
"//base:i18n", "//base:i18n",
"//base:prefs", "//base:prefs",
@@ -135,7 +136,6 @@ source_set("browser") {
"//ui/base", "//ui/base",
"//ui/gfx", "//ui/gfx",
"//url", "//url",
":in_memory_url_index_cache_proto",
] ]
} }
@@ -192,6 +192,8 @@ source_set("unit_tests") {
] ]
deps = [ deps = [
":browser",
":test_support",
"//base", "//base",
"//components/open_from_clipboard:test_support", "//components/open_from_clipboard:test_support",
"//components/search", "//components/search",
@@ -200,7 +202,5 @@ source_set("unit_tests") {
"//testing/gmock", "//testing/gmock",
"//testing/gtest", "//testing/gtest",
"//url", "//url",
":browser",
":test_support",
] ]
} }

@@ -23,8 +23,8 @@ if (is_chromeos) {
deps = [ deps = [
"//base", "//base",
"//components/keyed_service/core", "//components/keyed_service/core",
"//components/policy/proto",
"//components/policy:policy_component_common", "//components/policy:policy_component_common",
"//components/policy/proto",
"//crypto", "//crypto",
] ]

@@ -29,10 +29,10 @@ source_set("pairing") {
] ]
deps = [ deps = [
":proto",
"//base", "//base",
"//device/bluetooth", "//device/bluetooth",
"//net", "//net",
":proto",
] ]
} }

@@ -18,11 +18,11 @@ source_set("browser") {
deps = [ deps = [
"//base", "//base",
"//google_apis",
"//components/autofill/core/common", "//components/autofill/core/common",
"//components/password_manager/core/browser", "//components/password_manager/core/browser",
"//components/signin/core/browser", "//components/signin/core/browser",
"//components/sync_driver", "//components/sync_driver",
"//google_apis",
"//net", "//net",
"//url", "//url",
] ]
@@ -38,6 +38,7 @@ source_set("unit_tests") {
"sync_username_test_base.h", "sync_username_test_base.h",
] ]
deps = [ deps = [
":browser",
"//components/pref_registry", "//components/pref_registry",
"//components/signin/core/common", "//components/signin/core/common",
"//components/sync_driver:test_support", "//components/sync_driver:test_support",
@@ -46,6 +47,5 @@ source_set("unit_tests") {
"//sync", "//sync",
"//testing/gmock", "//testing/gmock",
"//testing/gtest", "//testing/gtest",
":browser",
] ]
} }

@@ -22,8 +22,8 @@ static_library("renderer") {
"//content/public/renderer", "//content/public/renderer",
"//gin", "//gin",
"//ppapi/shared_impl", "//ppapi/shared_impl",
"//third_party/WebKit/public:blink",
"//third_party/icu", "//third_party/icu",
"//v8", "//v8",
"//third_party/WebKit/public:blink",
] ]
} }

@@ -14,8 +14,8 @@ mojo_native_application("pdf_viewer") {
deps = [ deps = [
"//base", "//base",
"//components/bitmap_uploader", "//components/bitmap_uploader",
"//components/mus/public/interfaces",
"//components/mus/public/cpp", "//components/mus/public/cpp",
"//components/mus/public/interfaces",
"//components/web_view/public/interfaces", "//components/web_view/public/interfaces",
"//gpu", "//gpu",
"//mojo/application/public/cpp", "//mojo/application/public/cpp",

@@ -26,9 +26,9 @@ android_library("policy_java") {
android_library("policy_java_test_support") { android_library("policy_java_test_support") {
testonly = true testonly = true
deps = [ deps = [
":policy_java",
"//base:base_java", "//base:base_java",
"//base:base_java_test_support", "//base:base_java_test_support",
":policy_java",
] ]
java_files = [ java_files = [
"javatests/src/org/chromium/policy/test/annotations/Policies.java", "javatests/src/org/chromium/policy/test/annotations/Policies.java",
@@ -51,8 +51,8 @@ junit_binary("components_policy_junit_tests") {
"junit/src/org/chromium/policy/test/annotations/PoliciesTest.java", "junit/src/org/chromium/policy/test/annotations/PoliciesTest.java",
] ]
deps = [ deps = [
":policy_java_test_support",
":policy_java", ":policy_java",
":policy_java_test_support",
"//base:base_java", "//base:base_java",
"//third_party/junit:hamcrest", "//third_party/junit:hamcrest",
] ]

@@ -14,8 +14,8 @@ android_library("precache_java") {
android_library("precache_javatests") { android_library("precache_javatests") {
deps = [ deps = [
"//base:base_java_test_support",
":precache_java", ":precache_java",
"//base:base_java_test_support",
] ]
DEPRECATED_java_in_dir = "javatests/src" DEPRECATED_java_in_dir = "javatests/src"
} }

@@ -46,8 +46,8 @@ source_set("unit_tests") {
deps = [ deps = [
":ble", ":ble",
"//components/proximity_auth",
"//base/test:test_support", "//base/test:test_support",
"//components/proximity_auth",
"//device/bluetooth:mocks", "//device/bluetooth:mocks",
"//testing/gmock", "//testing/gmock",
"//testing/gtest", "//testing/gtest",

@@ -26,8 +26,8 @@ static_library("renderer_context_menu") {
deps = [ deps = [
"//base", "//base",
"//content/public/browser",
"//components/search_engines", "//components/search_engines",
"//content/public/browser",
"//third_party/WebKit/public:blink_headers", "//third_party/WebKit/public:blink_headers",
] ]
} }

@@ -32,9 +32,9 @@ source_set("unit_tests") {
] ]
deps = [ deps = [
":rlz",
"//net:test_support", "//net:test_support",
"//rlz:test_support", "//rlz:test_support",
"//ui/base", "//ui/base",
":rlz",
] ]
} }

@@ -60,8 +60,8 @@ static_library("search_engines") {
"//components/metrics/proto", "//components/metrics/proto",
"//components/pref_registry", "//components/pref_registry",
"//components/rappor", "//components/rappor",
"//components/sync_driver",
"//components/strings", "//components/strings",
"//components/sync_driver",
"//components/url_formatter", "//components/url_formatter",
"//components/webdata/common", "//components/webdata/common",
"//google_apis", "//google_apis",
@@ -114,8 +114,8 @@ source_set("unit_tests") {
} }
deps = [ deps = [
"//components/pref_registry:test_support",
":test_support", ":test_support",
"//components/pref_registry:test_support",
"//testing/gmock", "//testing/gmock",
"//testing/gtest", "//testing/gtest",
] ]

@@ -68,12 +68,6 @@ source_set("browser") {
deps = [ deps = [
"//base", "//base",
"//crypto",
"//google_apis",
"//net",
"//sql",
"//third_party/icu",
"//components/signin/core/common",
"//components/content_settings/core/browser", "//components/content_settings/core/browser",
"//components/content_settings/core/common", "//components/content_settings/core/common",
"//components/google/core/browser", "//components/google/core/browser",
@@ -81,8 +75,14 @@ source_set("browser") {
"//components/keyed_service/core", "//components/keyed_service/core",
"//components/metrics", "//components/metrics",
"//components/os_crypt", "//components/os_crypt",
"//components/webdata/common",
"//components/signin/core/account_id", "//components/signin/core/account_id",
"//components/signin/core/common",
"//components/webdata/common",
"//crypto",
"//google_apis",
"//net",
"//sql",
"//third_party/icu",
] ]
if (is_chromeos) { if (is_chromeos) {

@@ -235,8 +235,8 @@ source_set("unit_tests") {
"//components/pref_registry:test_support", "//components/pref_registry:test_support",
"//components/version_info", "//components/version_info",
"//net:test_support", "//net:test_support",
"//sync:test_support_sync_internal_api",
"//sync:test_support_sync_api", "//sync:test_support_sync_api",
"//sync:test_support_sync_internal_api",
"//testing/gmock", "//testing/gmock",
"//testing/gtest", "//testing/gtest",
"//url", "//url",

@@ -100,15 +100,15 @@ source_set("unit_tests") {
"//base:prefs", "//base:prefs",
"//base:prefs_test_support", "//base:prefs_test_support",
"//base/test:test_support", "//base/test:test_support",
"//testing/gmock",
"//components/bookmarks/browser", "//components/bookmarks/browser",
"//components/history/core/browser", "//components/history/core/browser",
"//components/sessions:test_support", "//components/sessions:test_support",
"//components/sync_driver", "//components/sync_driver",
"//components/sync_driver:test_support", "//components/sync_driver:test_support",
"//testing/gtest",
"//sync", "//sync",
"//sync:test_support_sync_api", "//sync:test_support_sync_api",
"//testing/gmock",
"//testing/gtest",
"//ui/base:base", "//ui/base:base",
"//url", "//url",
] ]

@@ -64,7 +64,7 @@ source_set("unit_tests") {
":test_support", ":test_support",
"//base:prefs", "//base:prefs",
"//components/pref_registry", "//components/pref_registry",
"//testing/gtest",
"//sync:test_support_sync_api", "//sync:test_support_sync_api",
"//testing/gtest",
] ]
} }

@@ -19,13 +19,13 @@ source_set("browser") {
] ]
deps = [ deps = [
":injected_js",
"//base", "//base",
"//components/translate/core/browser", "//components/translate/core/browser",
"//components/translate/core/common", "//components/translate/core/common",
"//components/translate/core/language_detection", "//components/translate/core/language_detection",
"//ios/web", "//ios/web",
"//url", "//url",
":injected_js",
] ]
} }
@@ -46,6 +46,7 @@ source_set("unit_tests") {
] ]
deps = [ deps = [
":browser",
"//base", "//base",
"//components/resources", "//components/resources",
"//components/translate/core/common", "//components/translate/core/common",
@@ -54,6 +55,5 @@ source_set("unit_tests") {
"//third_party/ocmock", "//third_party/ocmock",
"//ui/base", "//ui/base",
"//url", "//url",
":browser",
] ]
} }

@@ -55,9 +55,9 @@ source_set("update_client") {
"//components/crx_file", "//components/crx_file",
"//courgette:courgette_lib", "//courgette:courgette_lib",
"//crypto", "//crypto",
"//net",
"//third_party/libxml", "//third_party/libxml",
"//third_party/zlib:zip", "//third_party/zlib:zip",
"//net",
"//ui/base", "//ui/base",
"//url", "//url",
] ]
@@ -80,8 +80,8 @@ source_set("test_support") {
deps = [ deps = [
"//base", "//base",
"//net:test_support", "//net:test_support",
"//testing/gtest",
"//testing/gmock", "//testing/gmock",
"//testing/gtest",
"//url", "//url",
] ]
} }
@@ -100,13 +100,13 @@ source_set("unit_tests") {
] ]
deps = [ deps = [
":update_client",
":test_support", ":test_support",
":update_client",
"//base", "//base",
"//courgette:courgette_lib", "//courgette:courgette_lib",
"//net:test_support", "//net:test_support",
"//testing/gtest",
"//testing/gmock", "//testing/gmock",
"//testing/gtest",
"//third_party/libxml", "//third_party/libxml",
] ]
} }

@@ -19,8 +19,8 @@ source_set("url_formatter") {
deps = [ deps = [
"//base", "//base",
"//third_party/icu",
"//net", "//net",
"//third_party/icu",
"//url", "//url",
] ]

@@ -53,8 +53,8 @@ static_library("user_prefs_tracked") {
deps = [ deps = [
"//base:base", "//base:base",
"//base:prefs", "//base:prefs",
"//crypto:crypto",
"//components/pref_registry", "//components/pref_registry",
"//crypto:crypto",
] ]
} }

@@ -62,7 +62,6 @@ source_set("variations") {
} }
deps = [ deps = [
"proto",
"//base", "//base",
"//base:prefs", "//base:prefs",
"//components/compression", "//components/compression",
@@ -70,6 +69,7 @@ source_set("variations") {
"//crypto", "//crypto",
"//third_party/mt19937ar", "//third_party/mt19937ar",
"//third_party/protobuf:protobuf_lite", "//third_party/protobuf:protobuf_lite",
"proto",
] ]
if (is_android) { if (is_android) {
@@ -111,11 +111,11 @@ source_set("unit_tests") {
deps = [ deps = [
":variations", ":variations",
"net",
"proto",
"//base:prefs_test_support", "//base:prefs_test_support",
"//base/test:test_support", "//base/test:test_support",
"//components/compression", "//components/compression",
"//testing/gtest", "//testing/gtest",
"net",
"proto",
] ]
} }

@@ -62,8 +62,8 @@ template("generate_ui_string_overrider") {
source_set(target_name) { source_set(target_name) {
sources = get_target_outputs(":$gen_action_target_name") sources = get_target_outputs(":$gen_action_target_name")
deps = [ deps = [
"//components/variations/service",
":$gen_action_target_name", ":$gen_action_target_name",
"//components/variations/service",
] ]
forward_variables_from(invoker, [ "visibility" ]) forward_variables_from(invoker, [ "visibility" ])

@@ -22,9 +22,9 @@ source_set("version_info") {
] ]
deps = [ deps = [
":generate_version_info",
"//base", "//base",
"//components/strings", "//components/strings",
":generate_version_info",
] ]
if (use_unofficial_version_number) { if (use_unofficial_version_number) {

@@ -42,9 +42,9 @@ android_library("web_contents_delegate_android_java") {
deps = [ deps = [
":web_contents_delegate_android_java_resources", ":web_contents_delegate_android_java_resources",
"//base:base_java", "//base:base_java",
"//ui/android:ui_java",
"//content/public/android:content_java", "//content/public/android:content_java",
"//content/public/android:content_java_resources", "//content/public/android:content_java_resources",
"//ui/android:ui_java",
] ]
DEPRECATED_java_in_dir = "android/java/src" DEPRECATED_java_in_dir = "android/java/src"
} }

@@ -63,8 +63,8 @@ source_set("unit_tests") {
} }
deps = [ deps = [
":web_resource",
":test_support", ":test_support",
":web_resource",
"//base", "//base",
"//base:prefs_test_support", "//base:prefs_test_support",
"//components/version_info", "//components/version_info",

@@ -119,9 +119,9 @@ mojo_native_application("apptests") {
":test_support", ":test_support",
"//base", "//base",
"//base/test:test_config", "//base/test:test_config",
"//components/mus/public/cpp",
"//components/mus/public/cpp/tests:test_support", "//components/mus/public/cpp/tests:test_support",
"//components/mus/public/interfaces", "//components/mus/public/interfaces",
"//components/mus/public/cpp",
"//components/web_view/public/cpp", "//components/web_view/public/cpp",
"//components/web_view/public/interfaces", "//components/web_view/public/interfaces",
"//mojo/application/public/cpp:sources", "//mojo/application/public/cpp:sources",

@@ -10,9 +10,7 @@ mojom("interfaces") {
"web_view.mojom", "web_view.mojom",
] ]
import_dirs = [ import_dirs = [ "//mojo/services" ]
"//mojo/services"
]
deps = [ deps = [
"//components/mus/public/interfaces", "//components/mus/public/interfaces",

@@ -87,8 +87,8 @@ source_set("unit_tests") {
"//components/test_runner:test_runner", "//components/test_runner:test_runner",
"//crypto", "//crypto",
"//crypto:platform", "//crypto:platform",
"//testing/perf",
"//testing/gtest", "//testing/gtest",
"//testing/perf",
"//third_party/WebKit/public:blink", "//third_party/WebKit/public:blink",
"//third_party/re2", "//third_party/re2",
] ]

@@ -28,11 +28,11 @@ source_set("unit_tests") {
] ]
deps = [ deps = [
":webp_transcode",
"//base", "//base",
"//net", "//net",
"//testing/gmock", "//testing/gmock",
"//testing/gtest", "//testing/gtest",
"//third_party/ocmock", "//third_party/ocmock",
":webp_transcode",
] ]
} }

Some files were not shown because too many files have changed in this diff Show More