Convert //mash to define service names in mojom

mash/session/session.cc

Index: mash/session/session.cc
diff --git a/mash/session/session.cc b/mash/session/session.cc
index 8c1e48cdc5143a1610bb438425b1ec4afda286c1..f72a9a3595bcece98dadba266f7dfba77f244d6c 100644
--- a/mash/session/session.cc
+++ b/mash/session/session.cc
@@ -7,7 +7,11 @@
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
+#include "content/public/common/service_names.mojom.h"
+#include "mash/login/public/interfaces/constants.mojom.h"
 #include "mash/login/public/interfaces/login.mojom.h"
+#include "mash/quick_launch/public/interfaces/constants.mojom.h"
+#include "mash/screenlock/public/interfaces/constants.mojom.h"
 #include "services/service_manager/public/cpp/connection.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/service_manager/public/cpp/interface_registry.h"
@@ -34,7 +38,7 @@ void Session::OnStart() {
   StartQuickLaunch();
 
   // Launch a chrome window for dev convience; don't do this in the long term.
-  context()->connector()->Connect("content_browser");
+  context()->connector()->Connect(content::mojom::kBrowserServiceName);
 }
 
 bool Session::OnConnect(const service_manager::ServiceInfo& remote_info,
@@ -47,7 +51,8 @@ void Session::Logout() {
   // TODO(beng): Notify connected listeners that login is happening, potentially
   // give them the option to stop it.
   mash::login::mojom::LoginPtr login;
-  context()->connector()->ConnectToInterface("login", &login);
+  context()->connector()->ConnectToInterface(login::mojom::kServiceName,
+                                             &login);
   login->ShowLoginUI();
   // This kills the user environment.
   base::MessageLoop::current()->QuitWhenIdle();
@@ -55,7 +60,8 @@ void Session::Logout() {
 
 void Session::SwitchUser() {
   mash::login::mojom::LoginPtr login;
-  context()->connector()->ConnectToInterface("login", &login);
+  context()->connector()->ConnectToInterface(login::mojom::kServiceName,
+                                             &login);
   login->SwitchUser();
 }
 
@@ -100,14 +106,14 @@ void Session::StartWindowManager() {
 
 void Session::StartQuickLaunch() {
   StartRestartableService(
-      "quick_launch",
+      quick_launch::mojom::kServiceName,
       base::Bind(&Session::StartQuickLaunch,
                  base::Unretained(this)));
 }
 
 void Session::StartScreenlock() {
   StartRestartableService(
-      "screenlock",
+      screenlock::mojom::kServiceName,
       base::Bind(&Session::StartScreenlock,
                  base::Unretained(this)));
 }