Remove MOJO_SHELL_CLIENT define.

chrome/browser/chrome_browser_main.cc

Index: chrome/browser/chrome_browser_main.cc
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index c7e82fed41a5b7766de40d395aea095ba96e6c8c..d1a7a6e3866a7442a68adb0d2c8ef6b4d0b92f2d 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -268,7 +268,7 @@
 #include "chrome/browser/usb/web_usb_detector.h"
 #endif
 
-#if defined(MOJO_SHELL_CLIENT)
+#if defined(USE_AURA)

[Ben Goodger (Google), 2016/08/04 14:43:36]

So you're actually reducing the # of places this stuff is built. How about not
guarding it? It's not that much code. It's not immediately apparent why it's
USE_AURA specific.

[sadrul, 2016/08/04 14:47:43]

MOJO_SHELL_CLIENT is currently defined (and the dependency on services/ui added)
only for use_aura
(https://cs.chromium.org/chromium/src/chrome/browser/BUILD.gn?sq=package:chrom...).
I can turn it on for all platforms, but I'll do that in a separate CL?

 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "content/public/common/mojo_shell_connection.h"
 #include "services/shell/runner/common/client_util.h"
@@ -1224,7 +1224,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
 }
 
 void ChromeBrowserMainParts::PreMainMessageLoopRun() {
-#if defined(MOJO_SHELL_CLIENT)
+#if defined(USE_AURA)
   if (content::MojoShellConnection::GetForProcess() && shell::ShellIsRemote()) {
     content::MojoShellConnection::GetForProcess()->SetConnectionLostClosure(
         base::Bind(&chrome::SessionEnding));