Create ios/web/public/service and ios/web/service directories.

This CL is a part of ios/web restructuring proposed here:
https://docs.google.com/document/d/1C2YIU0rDbH5wz2VI6nk0COrktwY3DbF-e7QbMIAKEJc/edit

Bug: 942244
Change-Id: Ifd5cee307d197f877864e1700de8be0704f48707
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1709842
Commit-Queue: Eugene But <eugenebut@chromium.org>
Reviewed-by: Ken Rockot <rockot@google.com>
Reviewed-by: Mustafa Emre Acer <meacer@chromium.org>
Auto-Submit: Eugene But <eugenebut@chromium.org>
Cr-Commit-Position: refs/heads/master@{#680192}

ios/chrome/browser/browser_state/browser_state_services_egtest.mm

@@ -11,7 +11,7 @@
 #import "ios/chrome/test/app/chrome_test_util.h"
 #import "ios/chrome/test/earl_grey/chrome_test_case.h"
 #include "ios/web/public/browser_state.h"
-#include "ios/web/public/service_manager_connection.h"
+#include "ios/web/public/service/service_manager_connection.h"
 #include "services/identity/public/mojom/constants.mojom.h"
 #include "services/identity/public/mojom/identity_accessor.mojom.h"
 #include "services/service_manager/public/cpp/connector.h"

ios/chrome/browser/component_updater/ios_component_updater_configurator.cc

@@ -25,7 +25,7 @@
 #include "ios/chrome/browser/application_context.h"
 #include "ios/chrome/browser/google/google_brand.h"
 #include "ios/chrome/common/channel_info.h"
-#include "ios/web/public/service_manager_connection.h"
+#include "ios/web/public/service/service_manager_connection.h"
 #include "services/network/public/cpp/shared_url_loader_factory.h"
 #include "services/service_manager/public/cpp/connector.h"
 

ios/chrome/browser/web/chrome_web_client.mm

@@ -34,7 +34,7 @@
 #include "ios/public/provider/chrome/browser/voice/audio_session_controller.h"
 #include "ios/public/provider/chrome/browser/voice/voice_search_provider.h"
 #include "ios/web/public/navigation/browser_url_rewriter.h"
-#include "ios/web/public/service_names.mojom.h"
+#include "ios/web/public/service/service_names.mojom.h"
 #include "ios/web/public/user_agent.h"
 #include "net/http/http_util.h"
 #include "ui/base/l10n/l10n_util.h"

ios/chrome/browser/web/services_unittest.mm

@@ -9,7 +9,7 @@
 #include "components/services/unzip/public/mojom/constants.mojom.h"
 #include "components/services/unzip/public/mojom/unzipper.mojom.h"
 #include "ios/chrome/browser/web/chrome_web_client.h"
-#include "ios/web/public/service_manager_connection.h"
+#include "ios/web/public/service/service_manager_connection.h"
 #include "ios/web/public/test/scoped_testing_web_client.h"
 #include "ios/web/public/test/test_service_manager_context.h"
 #include "ios/web/public/test/test_web_thread_bundle.h"

ios/web/BUILD.gn

@@ -4,7 +4,6 @@
 
 import("//ios/build/config.gni")
 import("//ios/web/js_compile.gni")
-import("//mojo/public/tools/bindings/mojom.gni")
 import("//testing/test.gni")
 import("//tools/grit/grit_rule.gni")
 
@@ -18,16 +17,16 @@ group("all_tests") {
 
 source_set("web") {
   public_deps = [
-    ":service_names",
+    "//ios/web/public/service:service_names",
 
     # TODO(crbug.com/616244): Remove private files from public dependencies.
-    ":services",
     ":threads",
     "//ios/web/navigation:core",
     "//ios/web/net",
     "//ios/web/public",
     "//ios/web/public/download",
     "//ios/web/public/init",
+    "//ios/web/service",
     "//ios/web/web_state:web_state_impl_header",
     "//ios/web/web_state/ui",
     "//ios/web/web_state/ui:wk_web_view_configuration_provider",
@@ -40,7 +39,6 @@ source_set("web") {
     ":js_resources",
     ":navigation_resources",
     ":resources",
-    ":services",
     ":threads",
     "//base",
     "//ios/web/common",
@@ -53,15 +51,13 @@ source_set("web") {
     "//ios/web/public/security",
     "//ios/web/public/session",
     "//ios/web/security",
+    "//ios/web/service",
     "//ios/web/session",
     "//ios/web/thread",
     "//ios/web/web_state",
     "//ios/web/web_state:web_view_internal_creation_util",
     "//services/network:network_service",
-    "//services/network/public/mojom",
-    "//services/service_manager",
     "//services/service_manager/public/cpp",
-    "//services/service_manager/public/mojom",
   ]
 
   sources = [
@@ -94,34 +90,6 @@ source_set("threads") {
   configs += [ "//build/config/compiler:enable_arc" ]
 }
 
-source_set("services") {
-  deps = [
-    ":service_names",
-    "//ios/web/public",
-    "//services/network:network_service",
-    "//services/network/public/mojom",
-    "//services/service_manager",
-    "//services/service_manager/public/cpp",
-    "//services/service_manager/public/mojom",
-  ]
-  sources = [
-    "service_manager_connection_impl.cc",
-    "service_manager_connection_impl.h",
-    "service_manager_context.h",
-    "service_manager_context.mm",
-    "web_browser_manifest.h",
-    "web_browser_manifest.mm",
-  ]
-
-  configs += [ "//build/config/compiler:enable_arc" ]
-}
-
-mojom("service_names") {
-  sources = [
-    "public/service_names.mojom",
-  ]
-}
-
 source_set("core") {
   configs += [ "//build/config/compiler:enable_arc" ]
   deps = [
@@ -269,7 +237,6 @@ source_set("ios_web_general_unittests") {
     "//ios/web/test:test_constants",
     "//ios/web/test:test_support",
     "//net:test_support",
-    "//services/service_manager/public/cpp",
     "//testing/gmock",
     "//testing/gtest",
     "//third_party/ocmock",
@@ -280,7 +247,6 @@ source_set("ios_web_general_unittests") {
     "browser_state_unittest.cc",
     "history_state_util_unittest.mm",
     "network_context_owner_unittest.cc",
-    "service_manager_connection_impl_unittest.cc",
     "test/web_test_unittest.mm",
     "web_client_unittest.mm",
     "web_thread_unittest.cc",
@@ -314,7 +280,6 @@ source_set("ios_web_navigation_unittests") {
     "//ios/web/test/fakes",
     "//ios/web/web_state/ui:crw_web_view_navigation_proxy",
     "//net:test_support",
-    "//services/service_manager/public/cpp",
     "//testing/gmock",
     "//testing/gtest",
     "//third_party/ocmock",

ios/web/OWNERS

@@ -4,8 +4,3 @@ marq@chromium.org
 
 # TEAM: ios-directory-owners@chromium.org
 # OS: iOS
-
-per-file web_browser_manifest.cc=set noparent
-per-file web_browser_manifest.cc=file://ipc/SECURITY_OWNERS
-per-file web_browser_manifest.h=set noparent
-per-file web_browser_manifest.h=file://ipc/SECURITY_OWNERS

ios/web/browser_state.mm

@@ -17,8 +17,8 @@
 #include "base/token.h"
 #include "ios/web/public/init/network_context_owner.h"
 #include "ios/web/public/security/certificate_policy_cache.h"
-#include "ios/web/public/service_manager_connection.h"
-#include "ios/web/public/service_names.mojom.h"
+#include "ios/web/public/service/service_manager_connection.h"
+#include "ios/web/public/service/service_names.mojom.h"
 #include "ios/web/public/thread/web_task_traits.h"
 #include "ios/web/public/thread/web_thread.h"
 #include "ios/web/public/web_client.h"

ios/web/init/BUILD.gn

@@ -17,11 +17,11 @@ source_set("init") {
     "//base",
     "//base:i18n",
     "//crypto",
-    "//ios/web:services",
     "//ios/web:threads",
     "//ios/web/net",
     "//ios/web/public",
     "//ios/web/public/init",
+    "//ios/web/service",
     "//ios/web/webui",
     "//mojo/core/embedder",
     "//net",

ios/web/init/web_main_loop.mm

@@ -25,7 +25,7 @@
 #include "ios/web/public/init/web_main_parts.h"
 #include "ios/web/public/thread/web_task_traits.h"
 #import "ios/web/public/web_client.h"
-#include "ios/web/service_manager_context.h"
+#include "ios/web/service/service_manager_context.h"
 #include "ios/web/web_sub_thread.h"
 #include "ios/web/web_thread_impl.h"
 #include "ios/web/webui/url_data_manager_ios.h"

ios/web/public/BUILD.gn

@@ -11,6 +11,7 @@ source_set("public") {
     ":web_state_types",
     "//ios/web/public/favicon",
     "//ios/web/public/navigation",
+    "//ios/web/public/service",
     "//ios/web/public/thread",
     "//net",
     "//services/network/public/cpp",
@@ -29,7 +30,6 @@ source_set("public") {
     "java_script_dialog_callback.h",
     "java_script_dialog_presenter.h",
     "java_script_dialog_type.h",
-    "service_manager_connection.h",
     "url_schemes.mm",
     "web_client.h",
     "web_state/page_display_state.mm",
@@ -38,8 +38,6 @@ source_set("public") {
     "web_state/web_state.h",
     "web_state/web_state_delegate.h",
     "web_state/web_state_delegate_bridge.h",
-    "web_state/web_state_interface_provider.cc",
-    "web_state/web_state_interface_provider.h",
     "web_state/web_state_observer_bridge.h",
     "web_state/web_state_user_data.h",
   ]

ios/web/public/service/BUILD.gn

+# Copyright 2019 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//mojo/public/tools/bindings/mojom.gni")
+
+source_set("service") {
+  deps = [
+    "//base",
+    "//services/network/public/cpp",
+    "//services/network/public/mojom",
+    "//services/service_manager/public/cpp",
+    "//services/service_manager/public/cpp:cpp_types",
+    "//services/service_manager/public/mojom",
+  ]
+
+  sources = [
+    "service_manager_connection.h",
+    "web_state_interface_provider.h",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
+
+mojom("service_names") {
+  sources = [
+    "service_names.mojom",
+  ]
+}

ios/web/public/service/OWNERS

+rockot@google.com
+
+# TEAM: ios-directory-owners@chromium.org
+# OS: iOS
+
+per-file *.mojom=set noparent
+per-file *.mojom=file://ipc/SECURITY_OWNERS

ios/web/public/service/README.md

+This directory contains API for establishing mojo connection with web service.

ios/web/public/service_manager_connection.h → ios/web/public/service/service_manager_connection.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef IOS_WEB_PUBLIC_SERVICE_MANAGER_CONNECTION_H_
-#define IOS_WEB_PUBLIC_SERVICE_MANAGER_CONNECTION_H_
+#ifndef IOS_WEB_PUBLIC_SERVICE_SERVICE_MANAGER_CONNECTION_H_
+#define IOS_WEB_PUBLIC_SERVICE_SERVICE_MANAGER_CONNECTION_H_
 
 #include <memory>
 
@@ -69,4 +69,4 @@ class ServiceManagerConnection {
 
 }  // namespace web
 
-#endif  // IOS_WEB_PUBLIC_SERVICE_MANAGER_CONNECTION_H_
+#endif  // IOS_WEB_PUBLIC_SERVICE_SERVICE_MANAGER_CONNECTION_H_

ios/web/public/web_state/web_state_interface_provider.h → ios/web/public/service/web_state_interface_provider.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef IOS_WEB_WEB_STATE_WEB_STATE_INTERFACE_PROVIDER_H_
-#define IOS_WEB_WEB_STATE_WEB_STATE_INTERFACE_PROVIDER_H_
+#ifndef IOS_WEB_PUBLIC_SERVICE_WEB_STATE_INTERFACE_PROVIDER_H_
+#define IOS_WEB_PUBLIC_SERVICE_WEB_STATE_INTERFACE_PROVIDER_H_
 
 #include "base/macros.h"
 #include "mojo/public/cpp/bindings/binding.h"
@@ -36,4 +36,4 @@ class WebStateInterfaceProvider
 
 }  // namespace web
 
-#endif  // IOS_WEB_WEB_STATE_WEB_STATE_INTERFACE_PROVIDER_H_
+#endif  // IOS_WEB_PUBLIC_SERVICE_WEB_STATE_INTERFACE_PROVIDER_H_

ios/web/public/test/test_service_manager_context.mm

@@ -4,7 +4,7 @@
 
 #include "ios/web/public/test/test_service_manager_context.h"
 
-#include "ios/web/service_manager_context.h"
+#include "ios/web/service/service_manager_context.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."

ios/web/service/BUILD.gn

+# Copyright 2019 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+source_set("service") {
+  deps = [
+    "//ios/web/public",
+    "//ios/web/public/service:service_names",
+    "//services/network:network_service",
+    "//services/network/public/mojom",
+    "//services/service_manager",
+    "//services/service_manager/public/cpp",
+    "//services/service_manager/public/mojom",
+  ]
+  sources = [
+    "service_manager_connection_impl.cc",
+    "service_manager_connection_impl.h",
+    "service_manager_context.h",
+    "service_manager_context.mm",
+    "web_browser_manifest.h",
+    "web_browser_manifest.mm",
+    "web_state_interface_provider.cc",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
+
+source_set("unittests") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  testonly = true
+  deps = [
+    ":service",
+    "//base",
+    "//base/test:test_support",
+    "//ios/web/public/test",
+    "//services/service_manager/public/cpp",
+    "//testing/gtest",
+  ]
+
+  sources = [
+    "service_manager_connection_impl_unittest.cc",
+  ]
+}

ios/web/service/OWNERS

+rockot@google.com
+
+# TEAM: ios-directory-owners@chromium.org
+# OS: iOS
+
+per-file web_browser_manifest.cc=set noparent
+per-file web_browser_manifest.cc=file://ipc/SECURITY_OWNERS
+per-file web_browser_manifest.h=set noparent
+per-file web_browser_manifest.h=file://ipc/SECURITY_OWNERS

ios/web/service_manager_connection_impl.cc → ios/web/service/service_manager_connection_impl.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ios/web/service_manager_connection_impl.h"
+#include "ios/web/service/service_manager_connection_impl.h"
 
 #include <queue>
 #include <utility>
@@ -39,10 +39,9 @@ class ServiceManagerConnectionImpl::IOThreadContext
     : public base::RefCountedThreadSafe<IOThreadContext>,
       public service_manager::Service {
  public:
-  IOThreadContext(
-      service_manager::mojom::ServiceRequest service_request,
-      scoped_refptr<base::SequencedTaskRunner> io_task_runner,
-      service_manager::mojom::ConnectorRequest connector_request)
+  IOThreadContext(service_manager::mojom::ServiceRequest service_request,
+                  scoped_refptr<base::SequencedTaskRunner> io_task_runner,
+                  service_manager::mojom::ConnectorRequest connector_request)
       : pending_service_request_(std::move(service_request)),
         io_task_runner_(io_task_runner),
         pending_connector_request_(std::move(connector_request)),

ios/web/service_manager_connection_impl.h → ios/web/service/service_manager_connection_impl.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef IOS_WEB_SERVICE_MANAGER_SERVICE_MANAGER_CONNECTION_IMPL_H_
-#define IOS_WEB_SERVICE_MANAGER_SERVICE_MANAGER_CONNECTION_IMPL_H_
+#ifndef IOS_WEB_SERVICE_SERVICE_MANAGER_CONNECTION_IMPL_H_
+#define IOS_WEB_SERVICE_SERVICE_MANAGER_CONNECTION_IMPL_H_
 
 #include <memory>
 
@@ -11,7 +11,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/sequenced_task_runner.h"
-#include "ios/web/public/service_manager_connection.h"
+#include "ios/web/public/service/service_manager_connection.h"
 #include "mojo/public/cpp/system/message_pipe.h"
 #include "services/service_manager/public/cpp/identity.h"
 #include "services/service_manager/public/mojom/service.mojom.h"
@@ -63,4 +63,4 @@ class ServiceManagerConnectionImpl : public ServiceManagerConnection {
 
 }  // namespace web
 
-#endif  // IOS_WEB_SERVICE_MANAGER_SERVICE_MANAGER_CONNECTION_IMPL_H_
+#endif  // IOS_WEB_SERVICE_SERVICE_MANAGER_CONNECTION_IMPL_H_

ios/web/service_manager_connection_impl_unittest.cc → ios/web/service/service_manager_connection_impl_unittest.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ios/web/service_manager_connection_impl.h"
+#include "ios/web/service/service_manager_connection_impl.h"
 
 #include "base/bind_helpers.h"
 #include "base/run_loop.h"

ios/web/service_manager_context.h → ios/web/service/service_manager_context.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef IOS_WEB_SERVICE_MANAGER_CONTEXT_H_
-#define IOS_WEB_SERVICE_MANAGER_CONTEXT_H_
+#ifndef IOS_WEB_SERVICE_SERVICE_MANAGER_CONTEXT_H_
+#define IOS_WEB_SERVICE_SERVICE_MANAGER_CONTEXT_H_
 
 #include <string>
 
@@ -42,4 +42,4 @@ class ServiceManagerContext {
 
 }  // namespace web
 
-#endif  // IOS_WEB_SERVICE_MANAGER_CONTEXT_H_
+#endif  // IOS_WEB_SERVICE_SERVICE_MANAGER_CONTEXT_H_

ios/web/service_manager_context.mm → ios/web/service/service_manager_context.mm

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ios/web/service_manager_context.h"
+#include "ios/web/service/service_manager_context.h"
 
 #include <algorithm>
 #include <memory>
@@ -17,13 +17,13 @@
 #include "base/single_thread_task_runner.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/task/post_task.h"
-#include "ios/web/public/service_manager_connection.h"
+#include "ios/web/public/service/service_manager_connection.h"
 #include "ios/web/public/service_names.mojom.h"
 #include "ios/web/public/thread/web_task_traits.h"
 #include "ios/web/public/thread/web_thread.h"
 #include "ios/web/public/web_client.h"
-#include "ios/web/service_manager_connection_impl.h"
-#import "ios/web/web_browser_manifest.h"
+#include "ios/web/service/service_manager_connection_impl.h"
+#import "ios/web/service/web_browser_manifest.h"
 #include "mojo/public/cpp/bindings/remote.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/service_manager/public/cpp/constants.h"
@@ -155,9 +155,7 @@ class ServiceManagerContext::InProcessServiceManagerContext
     metadata->SetPID(base::GetCurrentProcId());
   }
 
-  void ShutDownOnIOThread() {
-    service_manager_.reset();
-  }
+  void ShutDownOnIOThread() { service_manager_.reset(); }
 
   std::unique_ptr<service_manager::ServiceManager> service_manager_;
 

ios/web/web_browser_manifest.h → ios/web/service/web_browser_manifest.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef IOS_WEB_WEB_BROWSER_MANIFEST_H_
-#define IOS_WEB_WEB_BROWSER_MANIFEST_H_
+#ifndef IOS_WEB_SERVICE_WEB_BROWSER_MANIFEST_H_
+#define IOS_WEB_SERVICE_WEB_BROWSER_MANIFEST_H_
 
 #include "services/service_manager/public/cpp/manifest.h"
 
@@ -17,4 +17,4 @@ const service_manager::Manifest& GetWebBrowserManifest();
 
 }  // namespace web
 
-#endif  // IOS_WEB_WEB_BROWSER_MANIFEST_H_
+#endif  // IOS_WEB_SERVICE_WEB_BROWSER_MANIFEST_H_

ios/web/web_browser_manifest.mm → ios/web/service/web_browser_manifest.mm

@@ -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 "ios/web/web_browser_manifest.h"
+#import "ios/web/service/web_browser_manifest.h"
 
 #include "base/no_destructor.h"
 #include "ios/web/public/service_names.mojom.h"

ios/web/public/web_state/web_state_interface_provider.cc → ios/web/service/web_state_interface_provider.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ios/web/public/web_state/web_state_interface_provider.h"
+#include "ios/web/public/service/web_state_interface_provider.h"
 
 namespace web {
 

ios/web/shell/shell_web_client.mm

@@ -7,7 +7,7 @@
 #import <UIKit/UIKit.h>
 
 #include "base/bind.h"
-#include "ios/web/public/service_names.mojom.h"
+#include "ios/web/public/service/service_names.mojom.h"
 #include "ios/web/public/user_agent.h"
 #import "ios/web/public/web_state/web_state.h"
 #include "ios/web/shell/shell_web_main_parts.h"

ios/web/shell/test/earl_grey/service_manager_app_interface.mm

@@ -9,7 +9,7 @@
 #import "base/strings/sys_string_conversions.h"
 #import "ios/testing/earl_grey/earl_grey_app.h"
 #include "ios/web/public/browser_state.h"
-#include "ios/web/public/service_manager_connection.h"
+#include "ios/web/public/service/service_manager_connection.h"
 #import "ios/web/public/web_state/web_state.h"
 #import "ios/web/shell/test/app/web_shell_test_util.h"
 #import "ios/web/shell/web_usage_controller.mojom.h"

ios/web/web_state/ui/crw_wk_ui_handler.mm

@@ -8,8 +8,8 @@
 #import "ios/web/navigation/wk_navigation_action_util.h"
 #import "ios/web/navigation/wk_navigation_util.h"
 #import "ios/web/public/java_script_dialog_type.h"
+#include "ios/web/public/service/web_state_interface_provider.h"
 #import "ios/web/public/web_client.h"
-#include "ios/web/public/web_state/web_state_interface_provider.h"
 #import "ios/web/web_state/ui/crw_context_menu_controller.h"
 #import "ios/web/web_state/ui/crw_wk_ui_handler_delegate.h"
 #import "ios/web/web_state/user_interaction_state.h"

ios/web/web_state/web_state_impl.mm

@@ -30,6 +30,7 @@
 #import "ios/web/public/java_script_dialog_presenter.h"
 #import "ios/web/public/navigation/navigation_item.h"
 #import "ios/web/public/navigation/web_state_policy_decider.h"
+#include "ios/web/public/service/web_state_interface_provider.h"
 #import "ios/web/public/session/crw_navigation_item_storage.h"
 #import "ios/web/public/session/crw_session_storage.h"
 #import "ios/web/public/session/serializable_user_data_manager.h"
@@ -37,7 +38,6 @@
 #import "ios/web/public/web_client.h"
 #import "ios/web/public/web_state/context_menu_params.h"
 #import "ios/web/public/web_state/web_state_delegate.h"
-#include "ios/web/public/web_state/web_state_interface_provider.h"
 #include "ios/web/public/web_state/web_state_observer.h"
 #include "ios/web/public/webui/web_ui_ios_controller.h"
 #import "ios/web/security/web_interstitial_impl.h"

ios/web/webui/mojo_facade_unittest.mm

@@ -11,9 +11,9 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/sys_string_conversions.h"
 #import "base/test/ios/wait_util.h"
+#include "ios/web/public/service/web_state_interface_provider.h"
 #import "ios/web/public/test/fakes/test_web_state.h"
 #include "ios/web/public/test/web_test.h"
-#include "ios/web/public/web_state/web_state_interface_provider.h"
 #include "ios/web/test/mojo_test.mojom.h"
 #include "ios/web/web_state/web_state_impl.h"
 #include "mojo/public/cpp/bindings/binding_set.h"

ios/web/webui/web_ui_mojo_inttest.mm

@@ -10,9 +10,9 @@
 #include "base/threading/thread_task_runner_handle.h"
 #include "ios/web/grit/ios_web_resources.h"
 #import "ios/web/public/navigation/navigation_manager.h"
+#include "ios/web/public/service/web_state_interface_provider.h"
 #import "ios/web/public/test/navigation_test_util.h"
 #import "ios/web/public/web_state/web_state.h"
-#include "ios/web/public/web_state/web_state_interface_provider.h"
 #include "ios/web/public/webui/web_ui_ios_controller.h"
 #include "ios/web/public/webui/web_ui_ios_controller_factory.h"
 #include "ios/web/public/webui/web_ui_ios_data_source.h"