[Services] Make embedder files available for reuse by iOS

This CL moves ServiceManager embedder files that will be reused by iOS
out of //content and into //services_manager/embedder. These files are
conceptually lower-level than the //content embedder as exemplified by
the fact that they'll be reused as-is on iOS.

Bug: 731588
Change-Id: I02e72cd1fef8f50137900400eb55f916b1ba8b68
Reviewed-on: https://chromium-review.googlesource.com/548456
Reviewed-by: Ken Rockot <[email protected]>
Reviewed-by: John Abd-El-Malek <[email protected]>
Commit-Queue: Colin Blundell <[email protected]>
Cr-Commit-Position: refs/heads/master@{#482922}
diff --git a/content/browser/browser_context.cc b/content/browser/browser_context.cc
index 2dd0458..cb740d98 100644
--- a/content/browser/browser_context.cc
+++ b/content/browser/browser_context.cc
@@ -481,7 +481,7 @@
 
     if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
             switches::kDisableMojoLocalStorage)) {
-      ServiceInfo info;
+      service_manager::EmbeddedServiceInfo info;
       // TODO(mek): Use sequenced task runner rather than single thread task
       // runner when mojo supports that (http://crbug.com/678155).
       info.factory = base::Bind(