Define MOJO_SHELL_CLIENT uniformly across content

Separated out of https://codereview.chromium.org/1452823003/

TBR=jam@chromium.org
http://crbug.com/551253

Review URL: https://codereview.chromium.org/1462753002

Cr-Commit-Position: refs/heads/master@{#360514}

content/app/BUILD.gn

@@ -70,6 +70,7 @@ if (is_ios) {
 content_app_extra_configs = [
   "//build/config/compiler:wexit_time_destructors",
   "//content:content_implementation",
+  "//content/public/common:mojo_shell_client",
   "//v8:external_startup_data",
 ]
 

content/browser/BUILD.gn

@@ -12,7 +12,10 @@ source_set("browser") {
   # internal content ones) should depend on the public one.
   visibility = [ "//content/public/browser:browser_sources" ]
 
-  configs += [ "//build/config:precompiled_headers" ]
+  configs += [
+    "//build/config:precompiled_headers",
+    "//content/public/common:mojo_shell_client",
+  ]
   defines = []
   libs = []
   ldflags = []
@@ -104,8 +107,6 @@ source_set("browser") {
             ],
             ".")
 
-    defines += [ "MOJO_SHELL_CLIENT" ]
-
     # Non-iOS deps.
     deps += [
       "//cc",

content/child/BUILD.gn

@@ -15,7 +15,10 @@ source_set("child") {
                         ".",
                         "//content")
 
-  configs += [ "//build/config:precompiled_headers" ]
+  configs += [
+    "//build/config:precompiled_headers",
+    "//content/public/common:mojo_shell_client",
+  ]
 
   public_deps = [
     "//third_party/mojo/src/mojo/edk/system",

content/common/BUILD.gn

@@ -209,7 +209,7 @@ source_set("common") {
     ]
   }
 
-  defines = [ "MOJO_SHELL_CLIENT" ]
+  defines = []
   include_dirs = []
   libs = []
   ldflags = []

content/gpu/BUILD.gn

@@ -38,7 +38,10 @@ source_set("gpu_sources") {
     "in_process_gpu_thread.h",
   ]
 
-  configs += [ "//content:content_implementation" ]
+  configs += [
+    "//content:content_implementation",
+    "//content/public/common:mojo_shell_client",
+  ]
 
   deps = [
     "//base",

content/plugin/BUILD.gn

@@ -28,7 +28,10 @@ if (enable_plugins && !is_linux) {
       "webplugin_proxy.h",
     ]
 
-    configs += [ "//content:content_implementation" ]
+    configs += [
+      "//content:content_implementation",
+      "//content/public/common:mojo_shell_client",
+    ]
 
     deps = [
       "//content:export",

content/ppapi_plugin/BUILD.gn

@@ -32,7 +32,10 @@ source_set("ppapi_plugin_sources") {
     "ppapi_thread.h",
   ]
 
-  configs += [ "//content:content_implementation" ]
+  configs += [
+    "//content:content_implementation",
+    "//content/public/common:mojo_shell_client",
+  ]
 
   deps = [
     "//base",

content/public/browser/BUILD.gn

@@ -46,6 +46,7 @@ source_set("browser_sources") {
   configs += [
     "//build/config:precompiled_headers",
     "//content:content_implementation",
+    "//content/public/common:mojo_shell_client",
   ]
 
   public_deps = [

content/public/common/BUILD.gn

@@ -44,6 +44,15 @@ config("static_switches_defines") {
   defines = [ "COMPILE_CONTENT_STATICALLY" ]
 }
 
+# Set in GN builds, triggering behavior in content when run from an external
+# Mojo shell.
+config("mojo_shell_client") {
+  # This configuration has only been tested on these platforms.
+  if (is_win || is_linux || is_chromeos) {
+    defines = [ "MOJO_SHELL_CLIENT" ]
+  }
+}
+
 # This target allows you to use the content_switches constants and statically
 # link to it, without depending on the rest of content. This is only for use
 # without content, or you will get multiply defined symbols.

content/public/renderer/BUILD.gn

@@ -25,7 +25,10 @@ source_set("renderer_sources") {
                         ".",
                         "//content")
 
-  configs += [ "//content:content_implementation" ]
+  configs += [
+    "//content:content_implementation",
+    "//content/public/common:mojo_shell_client",
+  ]
 
   deps = [
     "//content/public/common:common_sources",

content/renderer/BUILD.gn

@@ -18,6 +18,7 @@ source_set("renderer") {
 
   configs += [
     "//content:content_implementation",
+    "//content/public/common:mojo_shell_client",
     "//build/config/compiler:no_size_t_to_int_warning",
   ]
 

content/test/BUILD.gn

@@ -349,6 +349,7 @@ test("content_browsertests") {
   configs += [
     "//build/config:precompiled_headers",
     "//build/config/compiler:no_size_t_to_int_warning",
+    "//content/public/common:mojo_shell_client",
   ]
 
   deps = [
@@ -549,7 +550,10 @@ test("content_unittests") {
     }
   }
 
-  configs += [ "//build/config:precompiled_headers" ]
+  configs += [
+    "//build/config:precompiled_headers",
+    "//content/public/common:mojo_shell_client",
+  ]
 
   deps = [
     ":test_support",

content/utility/BUILD.gn

@@ -13,7 +13,10 @@ source_set("utility") {
   sources =
       rebase_path(content_utility_gypi_values.utility_sources, ".", "//content")
 
-  configs += [ "//content:content_implementation" ]
+  configs += [
+    "//content:content_implementation",
+    "//content/public/common:mojo_shell_client",
+  ]
 
   deps = [
     "//base",