0

Move services/shell to services/service_manager

Moving the symbols to the service_manager namespace will
happen in a follow-up CL.

Copied from https://codereview.chromium.org/2419723002 because
rietveld is choking on that one.

BUG=None
NOPRESUBMIT=true
TBR=ben@chromium.org
TBR=dcheng@chromium.org
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation

Review-Url: https://codereview.chromium.org/2419063003
Cr-Commit-Position: refs/heads/master@{#425565}
This commit is contained in:
rockot
2016-10-15 09:41:30 -07:00
committed by Commit bot
parent c735fc2eda
commit 734fb6640d
690 changed files with 1533 additions and 1533 deletions
BUILD.gn
android_webview
ash
blimp
chrome
android
app
browser
gpu
renderer
test
utility
chromecast
components
content
app
browser
child
common
gpu
ppapi_plugin
public
renderer
shell
test
utility
device
DEPS
battery
android
vibration
android
docs
extensions
headless
ios
mash
media
mojo
services
DEPSREADME.md
catalog
file
navigation
service_manager
BUILD.gnOWNERSREADME.md
background
connect_params.ccconnect_params.hconnect_util.ccconnect_util.hmanifest.jsonnative_runner.hnative_runner_delegate.h
public
runner
service_manager.ccservice_manager.hservice_overrides.ccservice_overrides.h
standalone
switches.ccswitches.h
tests
shell
tracing
ui
video_capture
testing/buildbot
third_party/WebKit/LayoutTests/harness-tests
ui

@ -302,7 +302,7 @@ group("both_gn_and_gyp") {
"//mojo/edk/test:mojo_public_bindings_unittests",
"//mojo/edk/test:mojo_public_system_unittests",
"//net:net_perftests",
"//services/shell/public/cpp",
"//services/service_manager/public/cpp",
"//storage//browser:storage_unittests",
"//third_party/WebKit/Source/platform:blink_platform_unittests",
"//third_party/WebKit/Source/platform/heap:blink_heap_unittests",
@ -605,7 +605,7 @@ group("both_gn_and_gyp") {
"//content/public/app:browser",
"//content/public/app:child",
"//mojo/edk/test:mojo_public_system_perftests",
"//services/shell/public/cpp",
"//services/service_manager/public/cpp",
"//testing/gmock:gmock_main",
"//third_party/codesighs:nm2tsv",
]

@ -41,7 +41,7 @@ include_rules = [
"+printing",
"+services/shell/public/cpp",
"+services/service_manager/public/cpp",
"+ui/gfx",
"+ui/gl",

@ -19,7 +19,7 @@
#include "content/public/browser/user_metrics.h"
#include "content/public/browser/web_contents.h"
#include "content/public/common/frame_navigate_params.h"
#include "services/shell/public/cpp/interface_registry.h"
#include "services/service_manager/public/cpp/interface_registry.h"
namespace android_webview {

@ -18,7 +18,7 @@ include_rules = [
"+printing",
"+services/shell/public/cpp",
"+services/service_manager/public/cpp",
"+third_party/WebKit/public/platform",
"+third_party/WebKit/public/web",

@ -38,8 +38,8 @@
#include "content/public/renderer/render_view.h"
#include "net/base/escape.h"
#include "net/base/net_errors.h"
#include "services/shell/public/cpp/interface_provider.h"
#include "services/shell/public/cpp/interface_registry.h"
#include "services/service_manager/public/cpp/interface_provider.h"
#include "services/service_manager/public/cpp/interface_registry.h"
#include "third_party/WebKit/public/platform/WebString.h"
#include "third_party/WebKit/public/platform/WebURL.h"
#include "third_party/WebKit/public/platform/WebURLError.h"

@ -847,7 +847,7 @@ component("ash") {
"//components/wallpaper",
"//media",
"//net",
"//services/shell/public/cpp",
"//services/service_manager/public/cpp",
"//skia",
"//third_party/icu",
"//ui/accessibility",

@ -10,7 +10,7 @@ include_rules = [
"+grit/ash_strings.h",
"+media",
"+mojo/public",
"+services/shell/public",
"+services/service_manager/public",
"+skia/ext",
"+third_party/cros_system_api",
"+third_party/skia",

@ -3,8 +3,8 @@
# found in the LICENSE file.
import("//build/config/ui.gni")
import("//services/shell/public/cpp/service.gni")
import("//services/shell/public/service_manifest.gni")
import("//services/service_manager/public/cpp/service.gni")
import("//services/service_manager/public/service_manifest.gni")
import("//mojo/public/tools/bindings/mojom.gni")
source_set("lib") {
@ -21,8 +21,8 @@ source_set("lib") {
"//mash/public/interfaces",
"//mojo/common",
"//mojo/public/cpp/bindings",
"//services/shell/public/cpp",
"//services/shell/public/cpp:sources",
"//services/service_manager/public/cpp",
"//services/service_manager/public/cpp:sources",
"//services/ui/public/cpp",
"//services/ui/public/interfaces",
"//ui/views",
@ -43,8 +43,8 @@ service("accessibility_autoclick") {
":lib",
"//base",
"//mojo/public/cpp/bindings",
"//services/shell/public/cpp",
"//services/shell/public/cpp:sources",
"//services/service_manager/public/cpp",
"//services/service_manager/public/cpp:sources",
"//ui/views/mus:for_mojo_application",
]

@ -5,6 +5,6 @@ include_rules = [
"+ash/public",
"+mash/public/interfaces",
"+mojo/public",
"+services/shell/public",
"+services/service_manager/public",
"+services/ui/public",
]

@ -7,7 +7,7 @@
#include "ash/public/interfaces/container.mojom.h"
#include "base/macros.h"
#include "base/strings/utf_string_conversions.h"
#include "services/shell/public/cpp/connector.h"
#include "services/service_manager/public/cpp/connector.h"
#include "services/ui/public/cpp/property_type_converters.h"
#include "services/ui/public/interfaces/window_manager_constants.mojom.h"
#include "ui/views/mus/aura_init.h"

@ -13,7 +13,7 @@
#include "base/macros.h"
#include "mash/public/interfaces/launchable.mojom.h"
#include "mojo/public/cpp/bindings/binding.h"
#include "services/shell/public/cpp/service.h"
#include "services/service_manager/public/cpp/service.h"
namespace views {
class AuraInit;

@ -3,8 +3,8 @@
// found in the LICENSE file.
#include "ash/autoclick/mus/autoclick_application.h"
#include "services/shell/public/c/main.h"
#include "services/shell/public/cpp/service_runner.h"
#include "services/service_manager/public/c/main.h"
#include "services/service_manager/public/cpp/service_runner.h"
MojoResult ServiceMain(MojoHandle service_request_handle) {
shell::ServiceRunner runner(new ash::autoclick::AutoclickApplication);

@ -8,7 +8,7 @@
#include "ash/common/system/tray/system_tray_controller.h"
#include "ash/common/wm_shell.h"
#include "base/bind.h"
#include "services/shell/public/cpp/interface_registry.h"
#include "services/service_manager/public/cpp/interface_registry.h"
namespace ash {

@ -8,7 +8,7 @@
#include "ash/common/wm_shell.h"
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "services/shell/public/cpp/connector.h"
#include "services/service_manager/public/cpp/connector.h"
namespace ash {

@ -4,8 +4,8 @@
import("//build/config/ui.gni")
import("//mojo/public/tools/bindings/mojom.gni")
import("//services/shell/public/cpp/service.gni")
import("//services/shell/public/service_manifest.gni")
import("//services/service_manager/public/cpp/service.gni")
import("//services/service_manager/public/service_manifest.gni")
import("//tools/grit/repack.gni")
source_set("lib") {
@ -106,7 +106,7 @@ source_set("lib") {
"//mash/public/interfaces",
"//mash/session/public/interfaces",
"//mojo/common:common_base",
"//services/shell/public/cpp",
"//services/service_manager/public/cpp",
"//services/tracing/public/cpp",
"//services/ui/common:mus_common",
"//services/ui/public/cpp",
@ -159,7 +159,7 @@ service("mus") {
":lib",
":resources",
":resources_200",
"//services/shell/public/cpp",
"//services/service_manager/public/cpp",
]
# TODO(beng): This target relies on //mash/session, but there is a cycle so we
@ -264,7 +264,7 @@ source_set("unittests") {
"//base/test:test_config",
"//base/test:test_support",
"//mojo/public/cpp/system",
"//services/shell/public/cpp:service_test_support",
"//services/service_manager/public/cpp:service_test_support",
"//services/ui/common:mus_common",
"//services/ui/public/cpp",
"//services/ui/public/cpp/tests:test_support",

@ -13,7 +13,7 @@ include_rules = [
"+mojo/common",
"+mojo/public",
"+services/catalog/public",
"+services/shell/public",
"+services/service_manager/public",
"+services/tracing/public",
]
# Shelf code is being moved into //ash/common. Please ask jamescook@ or msw@

@ -7,7 +7,7 @@
#include "ash/common/accelerators/accelerator_controller_delegate.h"
#include "base/macros.h"
#include "services/shell/public/cpp/connector.h"
#include "services/service_manager/public/cpp/connector.h"
namespace ash {
namespace mus {

@ -10,7 +10,7 @@
#include "base/macros.h"
#include "base/run_loop.h"
#include "mojo/public/cpp/bindings/binding.h"
#include "services/shell/public/cpp/service_test.h"
#include "services/service_manager/public/cpp/service_test.h"
#include "services/ui/common/event_matcher_util.h"
#include "services/ui/public/cpp/window.h"
#include "services/ui/public/interfaces/accelerator_registrar.mojom.h"

@ -4,7 +4,7 @@
#include "ash/mus/accessibility_delegate_mus.h"
#include "services/shell/public/cpp/connector.h"
#include "services/service_manager/public/cpp/connector.h"
namespace ash {

@ -5,7 +5,7 @@
#include "base/bind.h"
#include "base/command_line.h"
#include "base/run_loop.h"
#include "services/shell/public/cpp/service_test.h"
#include "services/service_manager/public/cpp/service_test.h"
#include "services/ui/public/interfaces/window_server_test.mojom.h"
namespace ash {

@ -4,7 +4,7 @@
#include "ash/mus/app_list_presenter_mus.h"
#include "services/shell/public/cpp/connector.h"
#include "services/service_manager/public/cpp/connector.h"
namespace ash {

@ -6,7 +6,7 @@
#include "ash/common/keyboard/keyboard_ui_observer.h"
#include "base/memory/ptr_util.h"
#include "services/shell/public/cpp/connector.h"
#include "services/service_manager/public/cpp/connector.h"
namespace ash {

@ -3,8 +3,8 @@
// found in the LICENSE file.
#include "ash/mus/window_manager_application.h"
#include "services/shell/public/c/main.h"
#include "services/shell/public/cpp/service_runner.h"
#include "services/service_manager/public/c/main.h"
#include "services/service_manager/public/cpp/service_runner.h"
MojoResult ServiceMain(MojoHandle service_request_handle) {
shell::ServiceRunner runner(new ash::mus::WindowManagerApplication);

@ -5,7 +5,7 @@
#include "ash/mus/new_window_delegate_mus.h"
#include "base/logging.h"
#include "services/shell/public/cpp/connector.h"
#include "services/service_manager/public/cpp/connector.h"
namespace ash {
namespace mus {

@ -32,7 +32,7 @@
#include "base/command_line.h"
#include "base/memory/ptr_util.h"
#include "mojo/public/cpp/bindings/type_converter.h"
#include "services/shell/public/cpp/connector.h"
#include "services/service_manager/public/cpp/connector.h"
#include "services/ui/common/switches.h"
#include "services/ui/common/util.h"
#include "services/ui/public/cpp/property_type_converters.h"

@ -7,7 +7,7 @@
#include "ash/common/wallpaper/wallpaper_controller.h"
#include "ash/common/wm_shell.h"
#include "components/wallpaper/wallpaper_layout.h"
#include "services/shell/public/cpp/connector.h"
#include "services/service_manager/public/cpp/connector.h"
#include "ui/wm/core/window_animations.h"
namespace {

@ -15,8 +15,8 @@
#include "ash/mus/window_manager.h"
#include "base/bind.h"
#include "base/memory/ptr_util.h"
#include "services/shell/public/cpp/connection.h"
#include "services/shell/public/cpp/connector.h"
#include "services/service_manager/public/cpp/connection.h"
#include "services/service_manager/public/cpp/connector.h"
#include "services/tracing/public/cpp/provider.h"
#include "services/ui/common/event_matcher_util.h"
#include "services/ui/public/cpp/gpu_service.h"

@ -16,7 +16,7 @@
#include "mash/session/public/interfaces/session.mojom.h"
#include "mojo/public/cpp/bindings/binding.h"
#include "mojo/public/cpp/bindings/binding_set.h"
#include "services/shell/public/cpp/service.h"
#include "services/service_manager/public/cpp/service.h"
#include "services/tracing/public/cpp/provider.h"
#include "services/ui/common/types.h"
#include "services/ui/public/interfaces/accelerator_registrar.mojom.h"

@ -6,7 +6,7 @@
#include "base/bind.h"
#include "base/macros.h"
#include "services/shell/public/cpp/service_test.h"
#include "services/service_manager/public/cpp/service_test.h"
#include "services/ui/public/cpp/window.h"
#include "services/ui/public/cpp/window_tree_client.h"
#include "services/ui/public/cpp/window_tree_client_delegate.h"

@ -3,8 +3,8 @@
# found in the LICENSE file.
import("//build/config/ui.gni")
import("//services/shell/public/cpp/service.gni")
import("//services/shell/public/service_manifest.gni")
import("//services/service_manager/public/cpp/service.gni")
import("//services/service_manager/public/service_manifest.gni")
import("//mojo/public/tools/bindings/mojom.gni")
source_set("lib") {
@ -20,8 +20,8 @@ source_set("lib") {
"//mash/public/interfaces",
"//mojo/common",
"//mojo/public/cpp/bindings",
"//services/shell/public/cpp",
"//services/shell/public/cpp:sources",
"//services/service_manager/public/cpp",
"//services/service_manager/public/cpp:sources",
"//services/ui/public/cpp",
"//services/ui/public/interfaces",
"//ui/views",
@ -42,8 +42,8 @@ service("touch_hud") {
":lib",
"//base",
"//mojo/public/cpp/bindings",
"//services/shell/public/cpp",
"//services/shell/public/cpp:sources",
"//services/service_manager/public/cpp",
"//services/service_manager/public/cpp:sources",
"//ui/views/mus:for_mojo_application",
]

@ -4,6 +4,6 @@ include_rules = [
"+ash/touch_hud",
"+mash/public/interfaces",
"+mojo/public",
"+services/shell/public",
"+services/service_manager/public",
"+services/ui/public",
]

@ -3,8 +3,8 @@
// found in the LICENSE file.
#include "ash/touch_hud/mus/touch_hud_application.h"
#include "services/shell/public/c/main.h"
#include "services/shell/public/cpp/service_runner.h"
#include "services/service_manager/public/c/main.h"
#include "services/service_manager/public/cpp/service_runner.h"
MojoResult ServiceMain(MojoHandle service_request_handle) {
shell::ServiceRunner runner(new ash::touch_hud::TouchHudApplication);

@ -8,7 +8,7 @@
#include "ash/touch_hud/touch_hud_renderer.h"
#include "base/macros.h"
#include "base/strings/utf_string_conversions.h"
#include "services/shell/public/cpp/connector.h"
#include "services/service_manager/public/cpp/connector.h"
#include "services/ui/public/cpp/property_type_converters.h"
#include "services/ui/public/interfaces/window_manager_constants.mojom.h"
#include "ui/views/mus/aura_init.h"

@ -10,7 +10,7 @@
#include "base/macros.h"
#include "mash/public/interfaces/launchable.mojom.h"
#include "mojo/public/cpp/bindings/binding.h"
#include "services/shell/public/cpp/service.h"
#include "services/service_manager/public/cpp/service.h"
namespace views {
class AuraInit;

@ -145,7 +145,7 @@ if (is_linux && !is_chromeos && use_x11) {
"//blimp/client/core/session",
"//blimp/net",
"//net",
"//services/shell/public/cpp",
"//services/service_manager/public/cpp",
# TODO(khushalsagar|scottmg): Remove this dependency from browser to
# blink. See https://crbug.com/608114.

@ -343,7 +343,7 @@ source_set("renderer") {
"//components/web_cache/renderer",
"//content/public/common",
"//content/public/renderer",
"//services/shell/public/cpp",
"//services/service_manager/public/cpp",
"//skia",
"//third_party/libwebp",
"//ui/gfx/geometry",

@ -13,7 +13,7 @@ include_rules = [
"+device/geolocation",
"+mojo/public",
"+net",
"+services/shell/public/cpp",
"+services/service_manager/public/cpp",
"+third_party/blimp_fonts",
"+third_party/khronos/GLES2/gl2.h",
"+third_party/WebKit/public/web/WebInputEvent.h",

@ -10,7 +10,7 @@
#include "blimp/engine/mojo/blob_channel_service.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/common/service_names.h"
#include "services/shell/public/cpp/interface_registry.h"
#include "services/service_manager/public/cpp/interface_registry.h"
#include "ui/base/resource/resource_bundle.h"
namespace blimp {

@ -9,7 +9,7 @@
#include "blimp/common/blob_cache/id_util.h"
#include "content/public/renderer/render_thread.h"
#include "services/shell/public/cpp/interface_provider.h"
#include "services/service_manager/public/cpp/interface_provider.h"
namespace blimp {
namespace engine {

@ -164,8 +164,8 @@ android_library("chrome_java") {
"//mojo/public/java:system",
"//net/android:net_java",
"//printing:printing_java",
"//services/shell/public/interfaces:interfaces_java",
"//services/shell/public/java:shell_java",
"//services/service_manager/public/interfaces:interfaces_java",
"//services/service_manager/public/java:service_manager_java",
"//third_party/WebKit/public:android_mojo_bindings_java",
"//third_party/WebKit/public:blink_headers_java",
"//third_party/android_data_chart:android_data_chart_java",

@ -14,5 +14,5 @@ include_rules = [
"+components/web_contents_delegate_android",
"+components/web_restrictions",
"+content/public/android/java",
"+services/shell/public/java",
"+services/service_manager/public/java",
]

@ -4,7 +4,7 @@
import("//build/config/ui.gni")
import("//chrome/common/features.gni")
import("//services/shell/public/service_manifest.gni")
import("//services/service_manager/public/service_manifest.gni")
import("//tools/grit/grit_rule.gni")
# This target is for dependency tracking for the command ID header.

@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//services/shell/public/service_manifest.gni")
import("//services/service_manager/public/service_manifest.gni")
source_set("mash") {
sources = [
@ -16,13 +16,13 @@ source_set("mash") {
"//content/public/common",
"//mash/package",
"//services/catalog/public/interfaces",
"//services/shell",
"//services/shell/background:lib",
"//services/shell/public/cpp",
"//services/shell/public/interfaces",
"//services/shell/runner/common",
"//services/shell/runner/host:child_process_base",
"//services/shell/runner/host:lib",
"//services/service_manager",
"//services/service_manager/background:lib",
"//services/service_manager/public/cpp",
"//services/service_manager/public/interfaces",
"//services/service_manager/runner/common",
"//services/service_manager/runner/host:child_process_base",
"//services/service_manager/runner/host:lib",
"//url",
]
data_deps = [

@ -10,5 +10,5 @@ include_rules = [
"+services/ui",
"+mash",
"+services/catalog",
"+services/shell",
"+services/service_manager",
]

@ -22,15 +22,15 @@
#include "mash/package/mash_packaged_service.h"
#include "mojo/public/cpp/bindings/binding_set.h"
#include "services/catalog/public/interfaces/catalog.mojom.h"
#include "services/shell/background/background_shell.h"
#include "services/shell/native_runner_delegate.h"
#include "services/shell/public/cpp/connector.h"
#include "services/shell/public/cpp/identity.h"
#include "services/shell/public/cpp/service.h"
#include "services/shell/public/cpp/service_context.h"
#include "services/shell/public/interfaces/service_factory.mojom.h"
#include "services/shell/runner/common/switches.h"
#include "services/shell/runner/host/child_process_base.h"
#include "services/service_manager/background/background_shell.h"
#include "services/service_manager/native_runner_delegate.h"
#include "services/service_manager/public/cpp/connector.h"
#include "services/service_manager/public/cpp/identity.h"
#include "services/service_manager/public/cpp/service.h"
#include "services/service_manager/public/cpp/service_context.h"
#include "services/service_manager/public/interfaces/service_factory.mojom.h"
#include "services/service_manager/runner/common/switches.h"
#include "services/service_manager/runner/host/child_process_base.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/ui_base_paths.h"
#include "ui/base/ui_base_switches.h"

@ -8,7 +8,7 @@
#include <memory>
#include "base/macros.h"
#include "services/shell/public/interfaces/service.mojom.h"
#include "services/service_manager/public/interfaces/service.mojom.h"
namespace shell {
class Service;

@ -1432,7 +1432,7 @@ split_static_library("browser") {
"//mojo/public/js",
"//net:extras",
"//net:net_with_v8",
"//services/shell/public/cpp",
"//services/service_manager/public/cpp",
"//skia",
"//sql",
"//storage/browser",

@ -35,7 +35,7 @@ include_rules = [
"+media/cdm/cdm_paths.h",
"+media/midi", # For midi switches
"+media/mojo", # For mojo media services.
"+services/shell/public/cpp",
"+services/service_manager/public/cpp",
"+services/ui/public",
"+ppapi/c", # For various types.
"+ppapi/host",
@ -43,7 +43,7 @@ include_rules = [
"+ppapi/shared_impl",
"+rlz",
"+sandbox/win/src", # The path doesn't say it, but this is the Windows sandbox.
"+services/shell",
"+services/service_manager",
"+skia/ext",
"+syzygy/kasko",
"+third_party/cros_system_api",

@ -24,8 +24,8 @@
#include "content/public/browser/web_contents.h"
#include "jni/ContextualSearchManager_jni.h"
#include "net/url_request/url_fetcher_impl.h"
#include "services/shell/public/cpp/interface_provider.h"
#include "services/shell/public/cpp/interface_registry.h"
#include "services/service_manager/public/cpp/interface_provider.h"
#include "services/service_manager/public/cpp/interface_registry.h"
using base::android::JavaParamRef;
using base::android::JavaRef;

@ -272,7 +272,7 @@
#if defined(USE_AURA)
#include "chrome/browser/lifetime/application_lifetime.h"
#include "content/public/common/service_manager_connection.h"
#include "services/shell/runner/common/client_util.h"
#include "services/service_manager/runner/common/client_util.h"
#endif
#if defined(OS_WIN) || defined(OS_MACOSX) || \

@ -183,8 +183,8 @@
#include "net/cookies/cookie_options.h"
#include "net/ssl/ssl_cert_request_info.h"
#include "ppapi/host/ppapi_host.h"
#include "services/shell/public/cpp/interface_provider.h"
#include "services/shell/public/cpp/service.h"
#include "services/service_manager/public/cpp/interface_provider.h"
#include "services/service_manager/public/cpp/service.h"
#include "storage/browser/fileapi/external_mount_points.h"
#include "third_party/WebKit/public/platform/modules/payments/payment_request.mojom.h"
#include "third_party/WebKit/public/platform/modules/webshare/webshare.mojom.h"
@ -262,7 +262,7 @@
#endif
#if defined(USE_AURA)
#include "services/shell/runner/common/client_util.h"
#include "services/service_manager/runner/common/client_util.h"
#include "services/ui/public/cpp/gpu_service.h"
#include "ui/views/mus/window_manager_connection.h"
#endif

@ -92,7 +92,7 @@ source_set("chromeos") {
"//mojo/common",
"//net",
"//ppapi/proxy:ipc", # For PpapiMsg_LoadPlugin
"//services/shell/public/cpp",
"//services/service_manager/public/cpp",
# TODO: care about enable_basic_printing and enable_print_preview.
"//components/sync",

@ -75,7 +75,7 @@
#include "extensions/common/host_id.h"
#include "mash/public/interfaces/launchable.mojom.h"
#include "media/audio/sounds/sounds_manager.h"
#include "services/shell/public/cpp/connector.h"
#include "services/service_manager/public/cpp/connector.h"
#include "ui/base/ime/chromeos/input_method_manager.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/keyboard/keyboard_controller.h"

@ -18,7 +18,7 @@
#include "mojo/edk/embedder/embedder.h"
#include "mojo/edk/embedder/platform_channel_pair.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
#include "services/shell/public/cpp/interface_provider.h"
#include "services/service_manager/public/cpp/interface_provider.h"
namespace arc {

@ -24,8 +24,8 @@
#include "content/public/common/service_manager_connection.h"
#include "mash/public/interfaces/launchable.mojom.h"
#include "mojo/public/cpp/bindings/binding_set.h"
#include "services/shell/public/cpp/connection.h"
#include "services/shell/public/cpp/interface_registry.h"
#include "services/service_manager/public/cpp/connection.h"
#include "services/service_manager/public/cpp/interface_registry.h"
#include "ui/app_list/presenter/app_list_presenter.mojom.h"
#include "ui/keyboard/keyboard.mojom.h"

@ -61,7 +61,7 @@
#include "content/public/browser/notification_service.h"
#include "content/public/common/content_switches.h"
#include "content/public/common/service_manager_connection.h"
#include "services/shell/public/cpp/connector.h"
#include "services/service_manager/public/cpp/connector.h"
#include "third_party/skia/include/core/SkColor.h"
#include "ui/gfx/codec/jpeg_codec.h"
#include "ui/gfx/image/image_skia_operations.h"

@ -8,7 +8,7 @@
#include "base/sys_info.h"
#include "chrome/browser/chromeos/system/fake_input_device_settings.h"
#include "content/public/browser/browser_thread.h"
#include "services/shell/runner/common/client_util.h"
#include "services/service_manager/runner/common/client_util.h"
#include "ui/ozone/public/input_controller.h"
#include "ui/ozone/public/ozone_platform.h"

@ -11,7 +11,7 @@
#include "extensions/common/extension.h"
#include "extensions/common/permissions/api_permission.h"
#include "extensions/common/permissions/permissions_data.h"
#include "services/shell/public/cpp/interface_registry.h"
#include "services/service_manager/public/cpp/interface_registry.h"
#if defined(ENABLE_MEDIA_ROUTER)
#include "chrome/browser/media/router/media_router_feature.h"

@ -14,7 +14,7 @@
#include "chrome/grit/generated_resources.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/utility_process_host.h"
#include "services/shell/public/cpp/interface_provider.h"
#include "services/service_manager/public/cpp/interface_provider.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/base/l10n/l10n_util.h"

@ -15,7 +15,7 @@
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/utility_process_host.h"
#include "content/public/browser/utility_process_host_client.h"
#include "services/shell/public/cpp/interface_provider.h"
#include "services/service_manager/public/cpp/interface_provider.h"
#include "ui/base/l10n/l10n_util.h"
namespace {

@ -41,7 +41,7 @@
#include "content/public/browser/web_contents.h"
#include "content/public/test/web_contents_tester.h"
#include "mojo/public/cpp/bindings/binding.h"
#include "services/shell/public/cpp/interface_provider.h"
#include "services/service_manager/public/cpp/interface_provider.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"

@ -543,8 +543,8 @@ test("chromevox_tests") {
"//chrome/test:test_support",
"//chrome/test:test_support_ui",
"//content/test:test_support",
"//services/shell/background:lib",
"//services/shell/background/tests:test_support",
"//services/service_manager/background:lib",
"//services/service_manager/background/tests:test_support",
"//testing/gmock",
"//testing/gtest",
"//ui/keyboard:resources",

@ -23,7 +23,7 @@
#include "content/public/common/process_type.h"
#include "extensions/browser/extension_registry.h"
#include "extensions/common/extension_set.h"
#include "services/shell/public/cpp/interface_provider.h"
#include "services/service_manager/public/cpp/interface_provider.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"

@ -19,7 +19,7 @@
#include "content/public/browser/render_process_host.h"
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_delegate.h"
#include "services/shell/public/cpp/interface_provider.h"
#include "services/service_manager/public/cpp/interface_provider.h"
#include "ui/base/l10n/l10n_util.h"
namespace task_manager {

@ -565,7 +565,7 @@ split_static_library("ui") {
"//device/usb",
"//media",
"//net:net_with_v8",
"//services/shell/runner/common",
"//services/service_manager/runner/common",
"//skia",
"//storage/browser",
"//storage/common",

@ -8,7 +8,7 @@
#include "ash/common/wm_shell.h"
#include "build/build_config.h"
#include "chrome/browser/ui/ash/ash_init.h"
#include "services/shell/runner/common/client_util.h"
#include "services/service_manager/runner/common/client_util.h"
#include "ui/aura/window_event_dispatcher.h"
namespace chrome {

@ -12,7 +12,7 @@
#include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
#include "chrome/browser/ui/ash/launcher/launcher_controller_helper.h"
#include "content/public/common/service_manager_connection.h"
#include "services/shell/public/cpp/connector.h"
#include "services/service_manager/public/cpp/connector.h"
#include "ui/display/display.h"
#include "ui/display/screen.h"

@ -26,7 +26,7 @@
#include "content/public/browser/user_metrics.h"
#include "content/public/common/service_manager_connection.h"
#include "net/base/escape.h"
#include "services/shell/public/cpp/connector.h"
#include "services/service_manager/public/cpp/connector.h"
#include "ui/base/l10n/l10n_util.h"
using chromeos::LoginState;

@ -57,7 +57,7 @@
#include "content/public/common/url_constants.h"
#include "extensions/browser/extension_system.h"
#include "mash/public/interfaces/launchable.mojom.h"
#include "services/shell/public/cpp/connector.h"
#include "services/service_manager/public/cpp/connector.h"
#include "ui/events/keycodes/keyboard_codes.h"
#if defined(OS_MACOSX)

@ -12,8 +12,8 @@
#include "base/run_loop.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/common/service_manager_connection.h"
#include "services/shell/public/cpp/connector.h"
#include "services/shell/runner/common/client_util.h"
#include "services/service_manager/public/cpp/connector.h"
#include "services/service_manager/runner/common/client_util.h"
#include "services/ui/public/cpp/gpu_service.h"
#include "services/ui/public/cpp/input_devices/input_device_client.h"
#include "services/ui/public/interfaces/input_devices/input_device_server.mojom.h"

@ -7,7 +7,7 @@
#if defined(USE_AURA)
#include "chrome/browser/ui/views/frame/browser_non_client_frame_view_mus.h"
#include "services/shell/runner/common/client_util.h"
#include "services/service_manager/runner/common/client_util.h"
#endif
#if !defined(OS_CHROMEOS)

@ -6,7 +6,7 @@
#include "chrome/browser/ui/views/frame/browser_frame_mus.h"
#include "chrome/browser/ui/views/frame/desktop_browser_frame_auralinux.h"
#include "services/shell/runner/common/client_util.h"
#include "services/service_manager/runner/common/client_util.h"
NativeBrowserFrame* NativeBrowserFrameFactory::Create(
BrowserFrame* browser_frame,

@ -6,7 +6,7 @@
#include "chrome/browser/ui/views/frame/browser_frame_mus.h"
#include "chrome/browser/ui/views/frame/desktop_browser_frame_aura.h"
#include "services/shell/runner/common/client_util.h"
#include "services/service_manager/runner/common/client_util.h"
NativeBrowserFrame* NativeBrowserFrameFactory::Create(
BrowserFrame* browser_frame,

@ -6,7 +6,7 @@
#include "chrome/browser/ui/views/frame/browser_frame_ash.h"
#include "chrome/browser/ui/views/frame/browser_frame_mus.h"
#include "services/shell/runner/common/client_util.h"
#include "services/service_manager/runner/common/client_util.h"
NativeBrowserFrame* NativeBrowserFrameFactory::Create(
BrowserFrame* browser_frame,

@ -51,7 +51,7 @@
#if defined(USE_AURA)
#include "chrome/browser/ui/views/tabs/window_finder_mus.h" // nogncheck
#include "content/public/common/service_manager_connection.h" // nogncheck
#include "services/shell/runner/common/client_util.h" // nogncheck
#include "services/service_manager/runner/common/client_util.h" // nogncheck
#include "ui/aura/env.h" // nogncheck
#include "ui/aura/window.h" // nogncheck
#include "ui/wm/core/window_modality_controller.h" // nogncheck

@ -15,7 +15,7 @@
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/web_ui_controller.h"
#include "mojo/public/cpp/system/core.h"
#include "services/shell/public/cpp/interface_registry.h"
#include "services/service_manager/public/cpp/interface_registry.h"
class MojoWebUIHandler;

@ -7,5 +7,5 @@ include_rules = [
"+media/base/video_frame.h",
"+media/gpu",
"+mojo/edk/embedder",
"+services/shell/public/cpp",
"+services/service_manager/public/cpp",
]

@ -14,8 +14,8 @@
#include "chrome/common/stack_sampling_configuration.h"
#include "components/metrics/child_call_stack_profile_collector.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
#include "services/shell/public/cpp/connector.h"
#include "services/shell/public/cpp/interface_registry.h"
#include "services/service_manager/public/cpp/connector.h"
#include "services/service_manager/public/cpp/interface_registry.h"
#if defined(OS_CHROMEOS)
#include "chrome/gpu/gpu_arc_video_service.h"

@ -48,7 +48,7 @@ include_rules = [
"+media/base",
"+ppapi/c",
"+ppapi/shared_impl",
"+services/shell/public/cpp",
"+services/service_manager/public/cpp",
"+skia",
"+storage/common",
]

@ -20,7 +20,7 @@
#include "content/public/renderer/render_frame.h"
#include "content/public/renderer/render_view.h"
#include "mojo/public/cpp/bindings/binding_set.h"
#include "services/shell/public/cpp/interface_provider.h"
#include "services/service_manager/public/cpp/interface_provider.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/WebKit/public/platform/WebString.h"
#include "third_party/WebKit/public/platform/WebURLRequest.h"

@ -13,7 +13,7 @@
#include "content/public/renderer/render_frame.h"
#include "content/public/renderer/render_view.h"
#include "mojo/public/cpp/bindings/binding_set.h"
#include "services/shell/public/cpp/interface_provider.h"
#include "services/service_manager/public/cpp/interface_provider.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/WebKit/public/web/WebDocument.h"
#include "third_party/WebKit/public/web/WebElement.h"

@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include <components/autofill/core/common/password_form.h>
#include "base/feature_list.h"
#include "base/macros.h"
#include "base/run_loop.h"
@ -19,13 +20,12 @@
#include "components/autofill/core/common/autofill_constants.h"
#include "components/autofill/core/common/form_data.h"
#include "components/autofill/core/common/form_field_data.h"
#include <components/autofill/core/common/password_form.h>
#include "components/autofill/core/common/password_form_field_prediction_map.h"
#include "components/password_manager/core/common/password_manager_features.h"
#include "content/public/common/associated_interface_provider.h"
#include "content/public/renderer/render_frame.h"
#include "content/public/renderer/render_view.h"
#include "services/shell/public/cpp/interface_provider.h"
#include "services/service_manager/public/cpp/interface_provider.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/WebKit/public/platform/WebString.h"
#include "third_party/WebKit/public/platform/WebVector.h"

@ -22,7 +22,7 @@
#include "content/public/common/associated_interface_provider.h"
#include "content/public/renderer/render_frame.h"
#include "content/public/renderer/render_view.h"
#include "services/shell/public/cpp/interface_provider.h"
#include "services/service_manager/public/cpp/interface_provider.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/WebKit/public/platform/WebString.h"
#include "third_party/WebKit/public/web/WebDocument.h"

@ -98,7 +98,7 @@
#include "net/base/net_errors.h"
#include "ppapi/c/private/ppb_pdf.h"
#include "ppapi/shared_impl/ppapi_switches.h"
#include "services/shell/public/cpp/interface_provider.h"
#include "services/service_manager/public/cpp/interface_provider.h"
#include "third_party/WebKit/public/platform/URLConversion.h"
#include "third_party/WebKit/public/platform/WebCachePolicy.h"
#include "third_party/WebKit/public/platform/WebSecurityOrigin.h"

@ -14,7 +14,7 @@
#include "content/public/renderer/render_frame.h"
#include "content/public/renderer/render_view.h"
#include "mojo/public/cpp/bindings/binding_set.h"
#include "services/shell/public/cpp/interface_provider.h"
#include "services/service_manager/public/cpp/interface_provider.h"
#include "third_party/WebKit/public/web/WebView.h"
namespace {

@ -46,7 +46,7 @@
#include "mojo/public/cpp/bindings/strong_binding.h"
#include "net/base/net_errors.h"
#include "net/base/net_module.h"
#include "services/shell/public/cpp/interface_registry.h"
#include "services/service_manager/public/cpp/interface_registry.h"
#include "third_party/WebKit/public/web/WebCache.h"
#include "third_party/WebKit/public/web/WebDocument.h"
#include "third_party/WebKit/public/web/WebFrame.h"

@ -12,7 +12,7 @@ if (is_chromeos) {
"//components/metrics/leak_detector:interfaces",
"//components/metrics/leak_detector:leak_detector",
"//components/metrics/proto:proto",
"//services/shell/public/cpp",
"//services/service_manager/public/cpp",
]
}
}

@ -10,7 +10,7 @@
#include "components/metrics/proto/memory_leak_report.pb.h"
#include "content/public/renderer/render_thread.h"
#include "mojo/public/cpp/bindings/interface_request.h"
#include "services/shell/public/cpp/interface_provider.h"
#include "services/service_manager/public/cpp/interface_provider.h"
LeakDetectorRemoteClient::LeakDetectorRemoteClient() {
// Connect to Mojo service.

@ -16,7 +16,7 @@
#include "content/public/renderer/render_view.h"
#include "extensions/common/constants.h"
#include "mojo/public/cpp/bindings/binding_set.h"
#include "services/shell/public/cpp/interface_provider.h"
#include "services/service_manager/public/cpp/interface_provider.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/WebKit/public/web/WebLocalFrame.h"

@ -13,7 +13,7 @@ import("//chrome/test/base/js2gtest.gni")
import("//components/os_crypt/features.gni")
import("//ppapi/features/features.gni")
import("//remoting/remoting_enable.gni")
import("//services/shell/public/service_manifest.gni")
import("//services/service_manager/public/service_manifest.gni")
import("//testing/test.gni")
import("//v8/gni/v8.gni")
@ -1182,8 +1182,8 @@ static_library("browser_tests_runner") {
deps += [
"//mash/package",
"//services/shell/background:lib",
"//services/shell/background/tests:test_support",
"//services/service_manager/background:lib",
"//services/service_manager/background/tests:test_support",
]
data_deps = [
@ -1897,7 +1897,7 @@ test("browser_tests") {
"//net",
"//net:test_support",
"//sdch",
"//services/shell/public/cpp",
"//services/service_manager/public/cpp",
"//skia",
"//testing/gmock",
"//testing/gtest",

@ -20,14 +20,14 @@
#include "content/public/common/service_manager_connection.h"
#include "content/public/test/test_launcher.h"
#include "mash/package/mash_packaged_service.h"
#include "services/shell/public/cpp/connector.h"
#include "services/shell/public/cpp/service.h"
#include "services/shell/public/cpp/service_context.h"
#include "services/shell/public/cpp/service_runner.h"
#include "services/shell/runner/common/switches.h"
#include "services/shell/runner/host/child_process.h"
#include "services/shell/runner/host/child_process_base.h"
#include "services/shell/runner/init.h"
#include "services/service_manager/public/cpp/connector.h"
#include "services/service_manager/public/cpp/service.h"
#include "services/service_manager/public/cpp/service_context.h"
#include "services/service_manager/public/cpp/service_runner.h"
#include "services/service_manager/runner/common/switches.h"
#include "services/service_manager/runner/host/child_process.h"
#include "services/service_manager/runner/host/child_process_base.h"
#include "services/service_manager/runner/init.h"
namespace {

@ -19,15 +19,15 @@
#include "mojo/edk/embedder/process_delegate.h"
#include "mojo/public/cpp/bindings/interface_request.h"
#include "services/catalog/store.h"
#include "services/shell/background/tests/test_catalog_store.h"
#include "services/shell/native_runner_delegate.h"
#include "services/shell/public/cpp/connector.h"
#include "services/shell/public/cpp/service.h"
#include "services/shell/public/cpp/service_context.h"
#include "services/shell/runner/common/client_util.h"
#include "services/shell/runner/common/switches.h"
#include "services/shell/service_manager.h"
#include "services/shell/switches.h"
#include "services/service_manager/background/tests/test_catalog_store.h"
#include "services/service_manager/native_runner_delegate.h"
#include "services/service_manager/public/cpp/connector.h"
#include "services/service_manager/public/cpp/service.h"
#include "services/service_manager/public/cpp/service_context.h"
#include "services/service_manager/runner/common/client_util.h"
#include "services/service_manager/runner/common/switches.h"
#include "services/service_manager/service_manager.h"
#include "services/service_manager/switches.h"
using shell::mojom::Service;
using shell::mojom::ServicePtr;

@ -10,8 +10,8 @@
#include "base/macros.h"
#include "base/process/process_handle.h"
#include "base/test/launcher/test_launcher.h"
#include "services/shell/background/background_shell.h"
#include "services/shell/public/interfaces/service.mojom.h"
#include "services/service_manager/background/background_shell.h"
#include "services/service_manager/public/interfaces/service.mojom.h"
namespace base {
class CommandLine;

@ -50,7 +50,7 @@ static_library("utility") {
"//courgette:courgette_lib",
"//media",
"//net:net_with_v8",
"//services/shell/public/cpp",
"//services/service_manager/public/cpp",
"//skia",
"//sql",
"//third_party/libxml",

@ -8,7 +8,7 @@ include_rules = [
"+courgette",
"+extensions/common",
"+media",
"+services/shell/public/cpp",
"+services/service_manager/public/cpp",
"+skia/ext",
"+third_party/libxml",
"+third_party/zlib/google",

@ -26,7 +26,7 @@
#include "courgette/third_party/bsdiff/bsdiff.h"
#include "ipc/ipc_channel.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
#include "services/shell/public/cpp/interface_registry.h"
#include "services/service_manager/public/cpp/interface_registry.h"
#include "third_party/zlib/google/zip.h"
#include "ui/gfx/geometry/size.h"

@ -20,7 +20,7 @@ include_rules = [
"+media/mojo",
"+mojo/public",
"+net",
"+services/shell/public",
"+services/service_manager/public",
"+ui/aura",
"+ui/base",
"+ui/compositor",

@ -55,7 +55,7 @@
#include "content/public/common/web_preferences.h"
#include "net/ssl/ssl_cert_request_info.h"
#include "net/url_request/url_request_context_getter.h"
#include "services/shell/public/cpp/interface_registry.h"
#include "services/service_manager/public/cpp/interface_registry.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/display/display.h"
#include "ui/display/screen.h"

@ -26,7 +26,7 @@ source_set("media") {
public_deps = [
"//media/mojo/interfaces",
"//media/mojo/services",
"//services/shell/public/cpp",
"//services/service_manager/public/cpp",
]
}

@ -43,7 +43,7 @@ source_set("renderer") {
"//gin:gin",
"//ipc",
"//media",
"//services/shell/public/cpp",
"//services/service_manager/public/cpp",
"//third_party/widevine/cdm:headers",
]
}

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