Change Service contract to pass ServiceInfo instead of Identity

R=rockot@chromium.org

Review-Url: https://codereview.chromium.org/2435153004
Cr-Commit-Position: refs/heads/master@{#427430}

ash/autoclick/mus/autoclick_application.cc

@@ -75,16 +75,16 @@ AutoclickApplication::AutoclickApplication()
 
 AutoclickApplication::~AutoclickApplication() {}
 
-void AutoclickApplication::OnStart(const service_manager::Identity& identity) {
+void AutoclickApplication::OnStart(const service_manager::ServiceInfo& info) {
   aura_init_.reset(new views::AuraInit(connector(), "views_mus_resources.pak"));
   window_manager_connection_ =
-      views::WindowManagerConnection::Create(connector(), identity);
+      views::WindowManagerConnection::Create(connector(), info.identity);
   autoclick_controller_common_.reset(new AutoclickControllerCommon(
       base::TimeDelta::FromMilliseconds(kDefaultAutoclickDelayMs), this));
 }
 
 bool AutoclickApplication::OnConnect(
-    const service_manager::Identity& remote_identity,
+    const service_manager::ServiceInfo& remote_info,
     service_manager::InterfaceRegistry* registry) {
   registry->AddInterface<mash::mojom::Launchable>(this);
   registry->AddInterface<mojom::AutoclickController>(this);

ash/autoclick/mus/autoclick_application.h

@@ -37,8 +37,8 @@ class AutoclickApplication
 
  private:
   // service_manager::Service:
-  void OnStart(const service_manager::Identity& identity) override;
-  bool OnConnect(const service_manager::Identity& remote_identity,
+  void OnStart(const service_manager::ServiceInfo& info) override;
+  bool OnConnect(const service_manager::ServiceInfo& remote_info,
                  service_manager::InterfaceRegistry* registry) override;
 
   // mojom::Launchable:

ash/mus/window_manager_application.cc

@@ -130,7 +130,7 @@ void WindowManagerApplication::ShutdownComponents() {
 }
 
 void WindowManagerApplication::OnStart(
-    const service_manager::Identity& identity) {
+    const service_manager::ServiceInfo& info) {
   aura_init_.reset(new views::AuraInit(connector(), "ash_mus_resources.pak",
                                        "ash_mus_resources_200.pak"));
   gpu_service_ = ui::GpuService::Create(connector());
@@ -142,7 +142,7 @@ void WindowManagerApplication::OnStart(
 
   MaterialDesignController::Initialize();
 
-  tracing_.Initialize(connector(), identity.name());
+  tracing_.Initialize(connector(), info.identity.name());
 
   std::unique_ptr<ui::WindowTreeClient> window_tree_client =
       base::MakeUnique<ui::WindowTreeClient>(window_manager_.get(),
@@ -157,15 +157,15 @@ void WindowManagerApplication::OnStart(
 }
 
 bool WindowManagerApplication::OnConnect(
-    const service_manager::Identity& remote_identity,
+    const service_manager::ServiceInfo& remote_info,
     service_manager::InterfaceRegistry* registry) {
   // Register services used in both classic ash and mash.
   mojo_interface_factory::RegisterInterfaces(
       registry, base::ThreadTaskRunnerHandle::Get());
 
   registry->AddInterface<ui::mojom::AcceleratorRegistrar>(this);
-  if (remote_identity.name() == "service:mash_session") {
-    connector()->ConnectToInterface(remote_identity, &session_);
+  if (remote_info.identity.name() == "service:mash_session") {
+    connector()->ConnectToInterface(remote_info.identity, &session_);
     session_->AddScreenlockStateListener(
         screenlock_state_listener_binding_.CreateInterfacePtrAndBind());
   }

ash/mus/window_manager_application.h

@@ -77,8 +77,8 @@ class WindowManagerApplication
   void ShutdownComponents();
 
   // service_manager::Service:
-  void OnStart(const service_manager::Identity& identity) override;
-  bool OnConnect(const service_manager::Identity& remote_identity,
+  void OnStart(const service_manager::ServiceInfo& info) override;
+  bool OnConnect(const service_manager::ServiceInfo& remote_info,
                  service_manager::InterfaceRegistry* registry) override;
 
   // service_manager::InterfaceFactory<ui::mojom::AcceleratorRegistrar>:

ash/touch_hud/mus/touch_hud_application.cc

@@ -64,14 +64,14 @@ class TouchHudUI : public views::WidgetDelegateView,
 TouchHudApplication::TouchHudApplication() : binding_(this) {}
 TouchHudApplication::~TouchHudApplication() {}
 
-void TouchHudApplication::OnStart(const service_manager::Identity& identity) {
+void TouchHudApplication::OnStart(const service_manager::ServiceInfo& info) {
   aura_init_.reset(new views::AuraInit(connector(), "views_mus_resources.pak"));
   window_manager_connection_ =
-      views::WindowManagerConnection::Create(connector(), identity);
+      views::WindowManagerConnection::Create(connector(), info.identity);
 }
 
 bool TouchHudApplication::OnConnect(
-    const service_manager::Identity& remote_identity,
+    const service_manager::ServiceInfo& remote_info,
     service_manager::InterfaceRegistry* registry) {
   registry->AddInterface<mash::mojom::Launchable>(this);
   return true;

ash/touch_hud/mus/touch_hud_application.h

@@ -31,8 +31,8 @@ class TouchHudApplication
 
  private:
   // service_manager::Service:
-  void OnStart(const service_manager::Identity& identity) override;
-  bool OnConnect(const service_manager::Identity& remote_identity,
+  void OnStart(const service_manager::ServiceInfo& info) override;
+  bool OnConnect(const service_manager::ServiceInfo& remote_info,
                  service_manager::InterfaceRegistry* registry) override;
 
   // mojom::Launchable:

components/filesystem/file_system_app.cc

@@ -40,11 +40,11 @@ FileSystemApp::FileSystemApp() : lock_table_(new LockTable) {}
 
 FileSystemApp::~FileSystemApp() {}
 
-void FileSystemApp::OnStart(const service_manager::Identity& identity) {
-  tracing_.Initialize(connector(), identity.name());
+void FileSystemApp::OnStart(const service_manager::ServiceInfo& info) {
+  tracing_.Initialize(connector(), info.identity.name());
 }
 
-bool FileSystemApp::OnConnect(const service_manager::Identity& remote_identity,
+bool FileSystemApp::OnConnect(const service_manager::ServiceInfo& remote_info,
                               service_manager::InterfaceRegistry* registry) {
   registry->AddInterface<mojom::FileSystem>(this);
   return true;

components/filesystem/file_system_app.h

@@ -32,8 +32,8 @@ class FileSystemApp
   static base::FilePath GetUserDataDir();
 
   // |service_manager::Service| override:
-  void OnStart(const service_manager::Identity& identity) override;
-  bool OnConnect(const service_manager::Identity& remote_identity,
+  void OnStart(const service_manager::ServiceInfo& info) override;
+  bool OnConnect(const service_manager::ServiceInfo& remote_info,
                  service_manager::InterfaceRegistry* registry) override;
 
   // |InterfaceFactory<Files>| implementation:

components/font_service/font_service_app.cc

@@ -48,11 +48,11 @@ FontServiceApp::FontServiceApp() {}
 
 FontServiceApp::~FontServiceApp() {}
 
-void FontServiceApp::OnStart(const service_manager::Identity& identity) {
-  tracing_.Initialize(connector(), identity.name());
+void FontServiceApp::OnStart(const service_manager::ServiceInfo& info) {
+  tracing_.Initialize(connector(), info.identity.name());
 }
 
-bool FontServiceApp::OnConnect(const service_manager::Identity& remote_identity,
+bool FontServiceApp::OnConnect(const service_manager::ServiceInfo& remote_info,
                                service_manager::InterfaceRegistry* registry) {
   registry->AddInterface(this);
   return true;

components/font_service/font_service_app.h

@@ -28,8 +28,8 @@ class FontServiceApp
 
  private:
   // service_manager::Service:
-  void OnStart(const service_manager::Identity& identity) override;
-  bool OnConnect(const service_manager::Identity& remote_identity,
+  void OnStart(const service_manager::ServiceInfo& info) override;
+  bool OnConnect(const service_manager::ServiceInfo& remote_info,
                  service_manager::InterfaceRegistry* registry) override;
 
   // service_manager::InterfaceFactory<mojom::FontService>:

components/leveldb/leveldb_app.cc

@@ -14,11 +14,11 @@ LevelDBApp::LevelDBApp() {}
 
 LevelDBApp::~LevelDBApp() {}
 
-void LevelDBApp::OnStart(const service_manager::Identity& identity) {
-  tracing_.Initialize(connector(), identity.name());
+void LevelDBApp::OnStart(const service_manager::ServiceInfo& info) {
+  tracing_.Initialize(connector(), info.identity.name());
 }
 
-bool LevelDBApp::OnConnect(const service_manager::Identity& remote_identity,
+bool LevelDBApp::OnConnect(const service_manager::ServiceInfo& remote_info,
                            service_manager::InterfaceRegistry* registry) {
   registry->AddInterface<mojom::LevelDBService>(this);
   return true;

components/leveldb/leveldb_app.h

@@ -24,8 +24,8 @@ class LevelDBApp
 
  private:
   // |Service| override:
-  void OnStart(const service_manager::Identity& identity) override;
-  bool OnConnect(const service_manager::Identity& remote_identity,
+  void OnStart(const service_manager::ServiceInfo& info) override;
+  bool OnConnect(const service_manager::ServiceInfo& remote_info,
                  service_manager::InterfaceRegistry* registry) override;
 
   // |InterfaceFactory<mojom::LevelDBService>| implementation:

content/common/service_manager/service_manager_connection_impl.cc

@@ -218,19 +218,19 @@ class ServiceManagerConnectionImpl::IOThreadContext
   /////////////////////////////////////////////////////////////////////////////
   // service_manager::Service implementation
 
-  void OnStart(const service_manager::Identity& identity) override {
+  void OnStart(const service_manager::ServiceInfo& info) override {
     DCHECK(io_thread_checker_.CalledOnValidThread());
     DCHECK(!initialize_handler_.is_null());
-    id_ = identity;
+    id_ = info.identity;
 
     InitializeCallback handler = base::ResetAndReturn(&initialize_handler_);
-    callback_task_runner_->PostTask(FROM_HERE, base::Bind(handler, identity));
+    callback_task_runner_->PostTask(FROM_HERE, base::Bind(handler, id_));
   }
 
-  bool OnConnect(const service_manager::Identity& remote_identity,
+  bool OnConnect(const service_manager::ServiceInfo& remote_info,
                  service_manager::InterfaceRegistry* registry) override {
     DCHECK(io_thread_checker_.CalledOnValidThread());
-    std::string remote_service = remote_identity.name();
+    std::string remote_service = remote_info.identity.name();
     if (remote_service == "service:service_manager") {
       // Only expose the ServiceFactory interface to the Service Manager.
       registry->AddInterface<service_manager::mojom::ServiceFactory>(this);
@@ -241,12 +241,12 @@ class ServiceManagerConnectionImpl::IOThreadContext
     {
       base::AutoLock lock(lock_);
       for (auto& entry : connection_filters_) {
-        accept |= entry.second->OnConnect(remote_identity, registry,
+        accept |= entry.second->OnConnect(remote_info.identity, registry,
                                           service_context_->connector());
       }
     }
 
-    if (remote_identity.name() == "service:content_browser" &&
+    if (remote_service == "service:content_browser" &&
         !has_browser_connection_) {
       has_browser_connection_ = true;
       registry->set_default_binder(default_browser_binder_);

content/public/test/test_service.cc

@@ -21,9 +21,9 @@ TestService::TestService() : service_binding_(this) {
 TestService::~TestService() {
 }
 
-bool TestService::OnConnect(const service_manager::Identity& remote_identity,
+bool TestService::OnConnect(const service_manager::ServiceInfo& remote_info,
                             service_manager::InterfaceRegistry* registry) {
-  requestor_name_ = remote_identity.name();
+  requestor_name_ = remote_info.identity.name();
   registry->AddInterface<mojom::TestService>(this);
   return true;
 }

content/public/test/test_service.h

@@ -29,7 +29,7 @@ class TestService
 
  private:
   // service_manager::Service:
-  bool OnConnect(const service_manager::Identity& remote_identity,
+  bool OnConnect(const service_manager::ServiceInfo& remote_info,
                  service_manager::InterfaceRegistry* registry) override;
 
   // service_manager::InterfaceFactory<mojom::TestService>:

mash/app_driver/app_driver.cc

@@ -86,11 +86,11 @@ void AppDriver::OnAvailableCatalogEntries(
   }
 }
 
-void AppDriver::OnStart(const service_manager::Identity& identity) {
+void AppDriver::OnStart(const service_manager::ServiceInfo& info) {
   AddAccelerators();
 }
 
-bool AppDriver::OnConnect(const service_manager::Identity& remote_identity,
+bool AppDriver::OnConnect(const service_manager::ServiceInfo& remote_info,
                           service_manager::InterfaceRegistry* registry) {
   return true;
 }

mash/app_driver/app_driver.h

@@ -30,8 +30,8 @@ class AppDriver : public service_manager::Service,
   void OnAvailableCatalogEntries(std::vector<catalog::mojom::EntryPtr> entries);
 
   // service_manager::Service:
-  void OnStart(const service_manager::Identity& identity) override;
-  bool OnConnect(const service_manager::Identity& remote_identity,
+  void OnStart(const service_manager::ServiceInfo& info) override;
+  bool OnConnect(const service_manager::ServiceInfo& remote_info,
                  service_manager::InterfaceRegistry* registry) override;
   bool OnStop() override;
 

mash/browser/browser.cc

@@ -867,16 +867,16 @@ std::unique_ptr<navigation::View> Browser::CreateView() {
   return base::MakeUnique<navigation::View>(std::move(factory));
 }
 
-void Browser::OnStart(const service_manager::Identity& identity) {
-  tracing_.Initialize(connector(), identity.name());
+void Browser::OnStart(const service_manager::ServiceInfo& info) {
+  tracing_.Initialize(connector(), info.identity.name());
 
   aura_init_.reset(
       new views::AuraInit(connector(), "views_mus_resources.pak"));
   window_manager_connection_ =
-      views::WindowManagerConnection::Create(connector(), identity);
+      views::WindowManagerConnection::Create(connector(), info.identity);
 }
 
-bool Browser::OnConnect(const service_manager::Identity& remote_identity,
+bool Browser::OnConnect(const service_manager::ServiceInfo& remote_info,
                         service_manager::InterfaceRegistry* registry) {
   registry->AddInterface<mojom::Launchable>(this);
   return true;

mash/browser/browser.h

@@ -43,8 +43,8 @@ class Browser : public service_manager::Service,
 
  private:
   // service_manager::Service:
-  void OnStart(const service_manager::Identity& identity) override;
-  bool OnConnect(const service_manager::Identity& remote_identity,
+  void OnStart(const service_manager::ServiceInfo& info) override;
+  bool OnConnect(const service_manager::ServiceInfo& remote_info,
                  service_manager::InterfaceRegistry* registry) override;
 
   // mojom::Launchable:

mash/catalog_viewer/catalog_viewer.cc

@@ -165,16 +165,16 @@ void CatalogViewer::RemoveWindow(views::Widget* window) {
     base::MessageLoop::current()->QuitWhenIdle();
 }
 
-void CatalogViewer::OnStart(const service_manager::Identity& identity) {
-  tracing_.Initialize(connector(), identity.name());
+void CatalogViewer::OnStart(const service_manager::ServiceInfo& info) {
+  tracing_.Initialize(connector(), info.identity.name());
 
   aura_init_.reset(
       new views::AuraInit(connector(), "views_mus_resources.pak"));
   window_manager_connection_ =
-      views::WindowManagerConnection::Create(connector(), identity);
+      views::WindowManagerConnection::Create(connector(), info.identity);
 }
 
-bool CatalogViewer::OnConnect(const service_manager::Identity& remote_identity,
+bool CatalogViewer::OnConnect(const service_manager::ServiceInfo& remote_info,
                               service_manager::InterfaceRegistry* registry) {
   registry->AddInterface<mojom::Launchable>(this);
   return true;

mash/catalog_viewer/catalog_viewer.h

@@ -36,8 +36,8 @@ class CatalogViewer
 
  private:
   // service_manager::Service:
-  void OnStart(const service_manager::Identity& identity) override;
-  bool OnConnect(const service_manager::Identity& remote_identity,
+  void OnStart(const service_manager::ServiceInfo& info) override;
+  bool OnConnect(const service_manager::ServiceInfo& remote_info,
                  service_manager::InterfaceRegistry* registry) override;
 
   // mojom::Launchable:

mash/example/views_examples/views_examples.cc

@@ -33,14 +33,14 @@ class ViewsExamples
 
  private:
   // service_manager::Service:
-  void OnStart(const service_manager::Identity& identity) override {
-    tracing_.Initialize(connector(), identity.name());
+  void OnStart(const service_manager::ServiceInfo& info) override {
+    tracing_.Initialize(connector(), info.identity.name());
     aura_init_.reset(
         new views::AuraInit(connector(), "views_mus_resources.pak"));
     window_manager_connection_ =
-        views::WindowManagerConnection::Create(connector(), identity);
+        views::WindowManagerConnection::Create(connector(), info.identity);
   }
-  bool OnConnect(const service_manager::Identity& remote_identity,
+  bool OnConnect(const service_manager::ServiceInfo& remote_info,
                  service_manager::InterfaceRegistry* registry) override {
     registry->AddInterface<mash::mojom::Launchable>(this);
     return true;

mash/example/window_type_launcher/window_type_launcher.cc

@@ -469,15 +469,15 @@ void WindowTypeLauncher::RemoveWindow(views::Widget* window) {
     base::MessageLoop::current()->QuitWhenIdle();
 }
 
-void WindowTypeLauncher::OnStart(const service_manager::Identity& identity) {
+void WindowTypeLauncher::OnStart(const service_manager::ServiceInfo& info) {
   aura_init_.reset(
       new views::AuraInit(connector(), "views_mus_resources.pak"));
   window_manager_connection_ =
-      views::WindowManagerConnection::Create(connector(), identity);
+      views::WindowManagerConnection::Create(connector(), info.identity);
 }
 
 bool WindowTypeLauncher::OnConnect(
-    const service_manager::Identity& remote_identity,
+    const service_manager::ServiceInfo& remote_info,
     service_manager::InterfaceRegistry* registry) {
   registry->AddInterface<mash::mojom::Launchable>(this);
   return true;

mash/example/window_type_launcher/window_type_launcher.h

@@ -30,8 +30,8 @@ class WindowTypeLauncher
 
  private:
   // service_manager::Service:
-  void OnStart(const service_manager::Identity& identity) override;
-  bool OnConnect(const service_manager::Identity& remote_identity,
+  void OnStart(const service_manager::ServiceInfo& info) override;
+  bool OnConnect(const service_manager::ServiceInfo& remote_info,
                  service_manager::InterfaceRegistry* registry) override;
 
   // mash::mojom::Launchable: