Commit 74088a9a authored by Lei Zhang's avatar Lei Zhang Committed by Commit Bot

Remove redundant components/ entries in chrome/browser/ DEPS files.

r372827 allowed chrome/browser/ to include components/, at the top
level, so there are now many rules inside chrome/browser/ that are
redundant.

Change-Id: I73a7c2c191f4511e64dc14ed4f4ecaa0f2790fcc
Reviewed-on: https://chromium-review.googlesource.com/1195737Reviewed-by: default avatarSylvain Defresne <sdefresne@chromium.org>
Reviewed-by: default avatarMaksim Ivanov <emaxx@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587671}
parent b774142b
...@@ -19,7 +19,6 @@ include_rules = [ ...@@ -19,7 +19,6 @@ include_rules = [
"+chrome_elf/dll_hash", "+chrome_elf/dll_hash",
"+chromeos", "+chromeos",
"+components", "+components",
"+components/policy/throttle/",
"+content/public/browser", "+content/public/browser",
"+content/public/common", "+content/public/common",
"+courgette", "+courgette",
......
...@@ -2,13 +2,6 @@ include_rules = [ ...@@ -2,13 +2,6 @@ include_rules = [
"-components/devtools_bridge", "-components/devtools_bridge",
"+cc/layers/layer.h", "+cc/layers/layer.h",
"+chrome_jni_registration/chrome_jni_registration.h", "+chrome_jni_registration/chrome_jni_registration.h",
"+components/embedder_suport",
"+components/ntp_snippets",
"+components/spellcheck/browser",
"+components/sync/android",
"+components/sync/test/fake_server/android",
"+components/toolbar",
"+components/viz/common/gpu/context_provider.h",
"+device/vr/buildflags/buildflags.h", "+device/vr/buildflags/buildflags.h",
"+sandbox/linux/seccomp-bpf/sandbox_bpf.h", "+sandbox/linux/seccomp-bpf/sandbox_bpf.h",
"+sandbox/linux/seccomp-bpf-helpers", "+sandbox/linux/seccomp-bpf-helpers",
......
include_rules = [
"+components/ntp_snippets/contextual",
"+components/prefs",
]
include_rules = [
"+components/contextual_search/content/common",
]
include_rules = [
"+components/user_manager",
]
include_rules = [
"+components/captive_portal",
]
...@@ -4,14 +4,6 @@ include_rules = [ ...@@ -4,14 +4,6 @@ include_rules = [
# crbug.com/728877 # crbug.com/728877
"+chrome/browser/ui/views/chrome_layout_provider.h", "+chrome/browser/ui/views/chrome_layout_provider.h",
"+components/constrained_window",
"+components/drive/drive_pref_names.h",
"+components/pairing",
"+components/password_manager/core/browser/hash_password_manager.h",
"+components/onc",
"+components/ownership",
"+components/session_manager/core",
"+components/user_manager",
"+cros", "+cros",
"+dbus", "+dbus",
"+device/bluetooth", "+device/bluetooth",
......
include_rules = [ include_rules = [
"+components/drive",
"+services/device/public/mojom", "+services/device/public/mojom",
] ]
include_rules = [
"+components/drive",
]
include_rules = [
"+components/drive",
]
include_rules = [ include_rules = [
"+components/captive_portal",
"+components/login",
"+components/toolbar",
"+components/user_manager",
"+extensions/components/native_app_window", "+extensions/components/native_app_window",
"+services/audio/public/cpp", "+services/audio/public/cpp",
"+services/device/public/mojom", "+services/device/public/mojom",
......
include_rules = [
"+components/captive_portal",
]
include_rules = [
"+components/feedback",
"+components/invalidation",
"+components/user_manager",
]
include_rules = [
"+components/sync/base",
"+components/sync/model",
"+components/sync/protocol",
]
include_rules = [
"+components/prefs",
]
include_rules = [
"+components/drive/drive_pref_names.h",
"+components/filename_generation/filename_generation.h",
"+components/safe_browsing/proto/csd.pb.h",
]
include_rules = [
"+components/drive",
"+components/keyed_service",
]
include_rules = [ include_rules = [
"+components/chrome_apps",
"+components/crx_file",
"+components/strings/grit/components_strings.h",
"+components/unified_consent",
"+components/user_manager",
"+extensions/strings/grit/extensions_strings.h", "+extensions/strings/grit/extensions_strings.h",
"+ui/base",
"+components/arc",
"+components/vector_icons",
"+services/network/public/mojom", "+services/network/public/mojom",
"+services/network/session_cleanup_cookie_store.h", "+services/network/session_cleanup_cookie_store.h",
"+ui/base",
# For access to testing command line switches. # For access to testing command line switches.
"+ppapi/shared_impl", "+ppapi/shared_impl",
......
include_rules = [ include_rules = [
"+apps", "+apps",
"+components/about_handler",
"+components/guest_view/common",
"+components/language/core/browser",
"+services/device/public", "+services/device/public",
# Enable remote assistance on Chrome OS # Enable remote assistance on Chrome OS
"+remoting/base", "+remoting/base",
"+remoting/host", "+remoting/host",
......
include_rules = [ include_rules = [
"+chrome/browser/ui/views/extensions", "+chrome/browser/ui/views/extensions",
] ]
specific_include_rules = {
"file_system_apitest_chromeos\.cc": [
"+components/drive"
],
}
include_rules = [ include_rules = [
"+components/onc",
"+components/wifi",
"+dbus", "+dbus",
] ]
specific_include_rules = {
"sync_file_system_browsertest\.cc": [
"+components/drive"
],
}
...@@ -4,8 +4,6 @@ include_rules = [ ...@@ -4,8 +4,6 @@ include_rules = [
"+chrome/browser/ui/views/feature_promos/incognito_window_promo_bubble_view.h", "+chrome/browser/ui/views/feature_promos/incognito_window_promo_bubble_view.h",
"+chrome/browser/ui/views/frame/browser_view.h", "+chrome/browser/ui/views/frame/browser_view.h",
"+chrome/browser/ui/views/toolbar/toolbar_view.h", "+chrome/browser/ui/views/toolbar/toolbar_view.h",
"+components/feature_engagement",
"+components/keyed_service",
] ]
specific_include_rules = { specific_include_rules = {
......
include_rules = [ include_rules = [
# Needed for InvalidationController JNI methods. # Needed for InvalidationController JNI methods.
"+chrome/jni/InvalidationController_jni.h", "+chrome/jni/InvalidationController_jni.h",
"+components/gcm_driver",
"+components/invalidation",
] ]
include_rules = [ include_rules = [
"+components/data_use_measurement",
# For nss_context_chromeos_browsertest.cc.
"+components/user_manager",
"+services/network/session_cleanup_channel_id_store.h", "+services/network/session_cleanup_channel_id_store.h",
] ]
......
include_rules = [ include_rules = [
"+chrome", "+chrome",
"+chromeos", "+chromeos",
"+components/arc/test",
"+components/drive/drive_pref_names.h",
"+components/user_manager",
"+content/public/browser", "+content/public/browser",
"+content/public/common", "+content/public/common",
"+content/public/test", "+content/public/test",
......
include_rules = [ include_rules = [
"+components/sync/base/model_type.h",
"+services/preferences/public/mojom", "+services/preferences/public/mojom",
] ]
# TODO(crbug.com/654988): Remove once the pref service is always used. # TODO(crbug.com/654988): Remove once the pref service is always used.
......
include_rules = [
"+components/about_handler",
"+components/cookie_config",
"+components/user_manager",
]
specific_include_rules = { specific_include_rules = {
"profile_impl.cc": [ "profile_impl.cc": [
# Profile embeds the Identity Service, but the dependence # Profile embeds the Identity Service, but the dependence
......
include_rules = [ include_rules = [
"+mojo", "+mojo",
"+components/chrome_cleaner",
"+services/network/test", "+services/network/test",
] ]
include_rules = [ include_rules = [
"+components/sync/base/time.h",
# For compressing data stored in SessionStorage. # For compressing data stored in SessionStorage.
"+third_party/bzip2", "+third_party/bzip2",
] ]
include_rules = [ include_rules = [
"+components/captive_portal",
"+components/certificate_transparency",
"+components/wifi",
"+services/network/test", "+services/network/test",
] ]
......
include_rules = [
"+components/subresource_filter/content/browser",
]
include_rules = [
"+components/data_use_measurement/core",
"+components/user_manager",
]
include_rules = [ include_rules = [
"+components/invalidation",
"+components/sync/driver",
"+components/sync_sessions",
"+components/sync_wifi",
"+google/cacheinvalidation", "+google/cacheinvalidation",
] ]
include_rules = [ include_rules = [
"+components/sync/base",
"-components/sync/engine", "-components/sync/engine",
"-components/sync/sessions", "-components/sync/sessions",
"-components/sync/syncable", "-components/sync/syncable",
......
include_rules = [
"+components/sync/syncable",
]
include_rules = [
"+components/onc", # wifi_credentials tests
# TODO(akalin): Figure out finer-grained dependencies.
"+components/sync",
]
include_rules = [ include_rules = [
"+components/drive",
"+services/device/public/mojom", "+services/device/public/mojom",
] ]
include_rules = [ include_rules = [
"+components/bubble",
"+components/crash/core/common/crash_keys.h",
"+components/favicon/core",
"+components/flags_ui",
"+components/toolbar",
"+components/ui_metrics",
"+components/url_formatter",
"+components/version_ui",
"+components/webapks_ui",
"+components/feature_engagement/features.h",
"-chrome/browser/ui/views", "-chrome/browser/ui/views",
"+mash/public/mojom", "+mash/public/mojom",
"+services/device/public/mojom", "+services/device/public/mojom",
......
...@@ -2,10 +2,6 @@ include_rules = [ ...@@ -2,10 +2,6 @@ include_rules = [
# ash depends on views, so code in ui/ash is allowed to depend on ui/views. # ash depends on views, so code in ui/ash is allowed to depend on ui/views.
"+chrome/browser/ui/views", "+chrome/browser/ui/views",
"+components/arc",
"+components/drive",
"+components/session_manager/core",
"+components/user_manager",
"+media", "+media",
] ]
......
include_rules = [
"+components/captive_portal",
]
include_rules = [ include_rules = [
"+chrome/browser/ui/views", "+chrome/browser/ui/views",
"+components/constrained_window",
"+components/user_manager",
"+mash/common", "+mash/common",
"+services/ws/public/cpp", "+services/ws/public/cpp",
"+third_party/libaddressinput", "+third_party/libaddressinput",
......
include_rules = [ include_rules = [
# TODO(mash): Remove. http://crbug.com/628715 # TODO(mash): Remove. http://crbug.com/628715
"+ash/strings", "+ash/strings",
"+components/about_ui",
"+components/invalidation",
"+components/onc",
"+components/proximity_auth",
"+components/sync/engine/events",
"+components/sync/sessions",
"+components/sync/base/weak_handle.h",
"+components/sync/js",
"+device/bluetooth", "+device/bluetooth",
"+extensions/strings/grit/extensions_strings.h", "+extensions/strings/grit/extensions_strings.h",
...@@ -19,8 +11,4 @@ include_rules = [ ...@@ -19,8 +11,4 @@ include_rules = [
"+third_party/angle", # For ANGLE version. "+third_party/angle", # For ANGLE version.
"+third_party/brotli", # For compressed resources. "+third_party/brotli", # For compressed resources.
"+third_party/zlib/zlib.h", # For compression level constants. "+third_party/zlib/zlib.h", # For compression level constants.
# DOM Distiller.
"+components/dom_distiller/core",
"+components/dom_distiller/webui",
] ]
include_rules = [ include_rules = [
"+components/login",
"+components/user_manager",
"+media/audio/sounds", "+media/audio/sounds",
"+services/device/public/mojom", "+services/device/public/mojom",
] ]
specific_include_rules = { specific_include_rules = {
"drive_internals_ui\.cc": [
"+components/drive"
],
"keyboard_overlay_ui\.cc": [ "keyboard_overlay_ui\.cc": [
# TODO(mash): Remove. http://crbug.com/770866 # TODO(mash): Remove. http://crbug.com/770866
"+ash/shell.h", "+ash/shell.h",
......
include_rules = [ include_rules = [
"+components/onc",
"+components/user_manager",
"+services/network/expect_ct_reporter.h", "+services/network/expect_ct_reporter.h",
] ]
include_rules = [ include_rules = [
"+chrome/browser/ui", "+chrome/browser/ui",
"+components/bubble",
"+device/base", "+device/base",
"+device/usb", "+device/usb",
] ]
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment