ApplicationConnection devolution, part 3.1. * Remove some ApplicationConnection forward declarations and |using| statements. * Also update the FML/Ozone stuff, which I don't know how to build. * Now we're very close to deleting ApplicationConnection. R=vardhan@google.com Review URL: https://codereview.chromium.org/1983473002 .

diff --git a/examples/apptest/example_service_application.h b/examples/apptest/example_service_application.h
index 2e65b03..bb22514 100644
--- a/examples/apptest/example_service_application.h
+++ b/examples/apptest/example_service_application.h

@@ -11,8 +11,6 @@
 
 namespace mojo {
 
-class ApplicationConnection;
-
 class ExampleServiceApplication : public ApplicationDelegate {
  public:
   ExampleServiceApplication();

diff --git a/examples/apptest/example_service_impl.h b/examples/apptest/example_service_impl.h
index 8ee909f..c8f6b48 100644
--- a/examples/apptest/example_service_impl.h
+++ b/examples/apptest/example_service_impl.h

@@ -11,8 +11,6 @@
 
 namespace mojo {
 
-class ApplicationConnection;
-
 class ExampleServiceImpl : public ExampleService {
  public:
   explicit ExampleServiceImpl(InterfaceRequest<ExampleService> request);

diff --git a/mojo/public/cpp/application/application_delegate.h b/mojo/public/cpp/application/application_delegate.h
index 6da1c4d..ab6b6d1 100644
--- a/mojo/public/cpp/application/application_delegate.h
+++ b/mojo/public/cpp/application/application_delegate.h

@@ -12,7 +12,6 @@
 
 namespace mojo {
 
-class ApplicationConnection;
 class ApplicationImpl;
 
 // An abstract class that the application may subclass to control various

diff --git a/services/python/content_handler/content_handler_main.cc b/services/python/content_handler/content_handler_main.cc
index e266495..04c9045 100644
--- a/services/python/content_handler/content_handler_main.cc
+++ b/services/python/content_handler/content_handler_main.cc

@@ -34,7 +34,6 @@
 namespace content_handler {
 
 using mojo::Application;
-using mojo::ApplicationConnection;
 using mojo::ApplicationDelegate;
 using mojo::ContentHandlerFactory;
 using mojo::InterfaceRequest;

diff --git a/services/test_service/test_request_tracker_impl.h b/services/test_service/test_request_tracker_impl.h
index 465d697..6d8b184 100644
--- a/services/test_service/test_request_tracker_impl.h
+++ b/services/test_service/test_request_tracker_impl.h

@@ -11,7 +11,6 @@
 #include "services/test_service/test_request_tracker.mojom.h"
 
 namespace mojo {
-class ApplicationConnection;
 namespace test {
 
 typedef std::map<uint64_t, std::vector<ServiceStats> > AllRecordsMap;

diff --git a/services/test_service/test_service_application.h b/services/test_service/test_service_application.h
index 277fa0c..9defb8a 100644
--- a/services/test_service/test_service_application.h
+++ b/services/test_service/test_service_application.h

@@ -9,9 +9,8 @@
 #include "mojo/public/cpp/system/macros.h"
 
 namespace mojo {
-class ApplicationConnection;
-
 namespace test {
+
 class TestService;
 class TestTimeService;
 

diff --git a/services/test_service/test_time_service_impl.h b/services/test_service/test_time_service_impl.h
index 67e5a28..5ca569b 100644
--- a/services/test_service/test_time_service_impl.h
+++ b/services/test_service/test_time_service_impl.h

@@ -12,9 +12,6 @@
 #include "services/test_service/test_service.mojom.h"
 
 namespace mojo {
-
-class ApplicationConnection;
-
 namespace test {
 
 class TrackedService;

diff --git a/shell/android/native_viewport_application_loader.cc b/shell/android/native_viewport_application_loader.cc
index 36e364b..35103c1 100644
--- a/shell/android/native_viewport_application_loader.cc
+++ b/shell/android/native_viewport_application_loader.cc

@@ -8,7 +8,6 @@
 #include "services/gles2/gpu_state.h"
 #include "services/native_viewport/native_viewport_impl.h"
 
-using mojo::ApplicationConnection;
 using mojo::ConnectionContext;
 using mojo::InterfaceRequest;
 

diff --git a/shell/application_manager/application_manager_unittest.cc b/shell/application_manager/application_manager_unittest.cc
index 0337e85..d9f4bff 100644
--- a/shell/application_manager/application_manager_unittest.cc
+++ b/shell/application_manager/application_manager_unittest.cc

@@ -22,7 +22,6 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 using mojo::Application;
-using mojo::ApplicationConnection;
 using mojo::ApplicationDelegate;
 using mojo::ApplicationImpl;
 using mojo::Callback;

diff --git a/ui/ozone/platform/drm/mojo/drm_ipc_init_helper.cc b/ui/ozone/platform/drm/mojo/drm_ipc_init_helper.cc
index 5182396..aa1b6a9 100644
--- a/ui/ozone/platform/drm/mojo/drm_ipc_init_helper.cc
+++ b/ui/ozone/platform/drm/mojo/drm_ipc_init_helper.cc

@@ -21,11 +21,11 @@
 
   void HostInitialize(mojo::ApplicationImpl* application) override;
   bool HostConfigureIncomingConnection(
-      mojo::ApplicationConnection* connection) override;
+      mojo::ServiceProviderImpl* service_provider_impl) override;
 
   void GpuInitialize(mojo::ApplicationImpl* application) override;
   bool GpuConfigureIncomingConnection(
-      mojo::ApplicationConnection* connection) override;
+      mojo::ServiceProviderImpl* service_provider_impl) override;
 
  private:
   mojo::OzoneDrmHostPtr ozone_drm_host_;
@@ -49,8 +49,8 @@
 }
 
 bool DrmIpcInitHelperMojo::HostConfigureIncomingConnection(
-    mojo::ApplicationConnection* connection) {
-  connection->GetServiceProviderImpl().AddService<mojo::OzoneDrmHost>(
+    mojo::ServiceProviderImpl* service_provider_impl) {
+  service_provider_impl->AddService<mojo::OzoneDrmHost>(
       [](const mojo::ConnectionContext& connection_context,
          mojo::InterfaceRequest<mojo::OzoneDrmHost> request) {
         new MojoDrmHostImpl(request.Pass());
@@ -59,8 +59,8 @@
 }
 
 bool DrmIpcInitHelperMojo::GpuConfigureIncomingConnection(
-    mojo::ApplicationConnection* connection) {
-  connection->GetServiceProviderImpl().AddService<mojo::OzoneDrmGpu>(
+    mojo::ServiceProviderImpl* service_provider_impl) {
+  service_provider_impl->AddService<mojo::OzoneDrmGpu>(
       [](const mojo::ConnectionContext& connection_context,
          mojo::InterfaceRequest<mojo::OzoneDrmGpu> request) {
         new MojoDrmGpuImpl(request.Pass());

diff --git a/ui/ozone/public/ipc_init_helper_mojo.h b/ui/ozone/public/ipc_init_helper_mojo.h
index 42db90d..bc15fc6 100644
--- a/ui/ozone/public/ipc_init_helper_mojo.h
+++ b/ui/ozone/public/ipc_init_helper_mojo.h

@@ -15,11 +15,11 @@
  public:
   virtual void HostInitialize(mojo::ApplicationImpl* application) = 0;
   virtual bool HostConfigureIncomingConnection(
-      mojo::ApplicationConnection* connection) = 0;
+      mojo::ServiceProviderImpl* service_provider_impl) = 0;
 
   virtual void GpuInitialize(mojo::ApplicationImpl* application) = 0;
   virtual bool GpuConfigureIncomingConnection(
-      mojo::ApplicationConnection* connection) = 0;
+      mojo::ServiceProviderImpl* service_provider_impl) = 0;
 };
 
 }  // namespace ui