Move service_manager to top level dir

BUG=None
TEST=Existing
TBR=darin

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@253973 0039d316-1c4b-4281-b951-d872f2087c98

10 files changed, 34 insertions, 21 deletions

diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp
index 8074028..91f7ce1 100644
--- a/mojo/mojo.gyp
+++ b/mojo/mojo.gyp
@@ -41,9 +41,10 @@
         'mojo_public_system_unittests',
         'mojo_public_utility_unittests',
         'mojo_sample_app',
+        'mojo_service_manager',
+        'mojo_service_manager_unittests',
         'mojo_shell',
         'mojo_shell_lib',
-        'mojo_shell_unittests',
         'mojo_system',
         'mojo_system_impl',
         'mojo_system_unittests',
@@ -328,6 +329,20 @@
       ],
     },
     {
+      'target_name': 'mojo_service_manager',
+      'type': 'static_library',
+      'dependencies': [
+        '../base/base.gyp:base',
+        '../net/net.gyp:net',
+        '../url/url.gyp:url_lib',
+        'mojo_shell_bindings',
+      ],
+      'sources': [
+        'service_manager/service_manager.cc',
+        'service_manager/service_manager.h',
+      ],
+    },
+    {
       'target_name': 'mojo_shell_lib',
       'type': 'static_library',
       'dependencies': [
@@ -336,6 +351,7 @@
         '../url/url.gyp:url_lib',
         'mojo_gles2_impl',
         'mojo_shell_bindings',
+        'mojo_service_manager',
         'mojo_system',
         'mojo_system_impl',
         'mojo_native_viewport_service',
@@ -355,8 +371,6 @@
         'shell/network_delegate.h',
         'shell/run.cc',
         'shell/run.h',
-        'shell/service_manager.cc',
-        'shell/service_manager.h',
         'shell/storage.cc',
         'shell/storage.h',
         'shell/switches.cc',
@@ -386,20 +400,20 @@
       ],
     },
     {
-      'target_name': 'mojo_shell_unittests',
+      'target_name': 'mojo_service_manager_unittests',
       'type': 'executable',
       'dependencies': [
         '../base/base.gyp:base',
         '../testing/gtest.gyp:gtest',
         'mojo_environment_standalone',
         'mojo_run_all_unittests',
+        'mojo_service_manager',
         'mojo_utility',
-        'mojo_shell_lib',
       ],
       'includes': [ 'public/bindings/mojom_bindings_generator.gypi' ],
       'sources': [
-        'shell/service_manager_unittest.cc',
-        'shell/test.mojom',
+        'service_manager/service_manager_unittest.cc',
+        'service_manager/test.mojom',
       ],
     },
   ],
diff --git a/mojo/shell/service_manager.cc b/mojo/service_manager/service_manager.cc
index 15146a8..bfc2bd7 100644
--- a/mojo/shell/service_manager.cc
+++ b/mojo/service_manager/service_manager.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/shell/service_manager.h"
+#include "mojo/service_manager/service_manager.h"
 
 #include "base/logging.h"
 #include "mojo/public/bindings/allocation_scope.h"
@@ -81,7 +81,7 @@ ServiceManager::Loader* ServiceManager::GetLoaderForURL(const GURL& gurl) {
 }
 
 void ServiceManager::Connect(const GURL& url,
-                               ScopedMessagePipeHandle client_handle) {
+                             ScopedMessagePipeHandle client_handle) {
   ServiceFactoryMap::const_iterator service_it =
       url_to_service_factory_.find(url);
   ServiceFactory* service_factory;
diff --git a/mojo/shell/service_manager.h b/mojo/service_manager/service_manager.h
index fa396c7..4c7cfd58 100644
--- a/mojo/shell/service_manager.h
+++ b/mojo/service_manager/service_manager.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_SHELL_service_manager_H_
-#define MOJO_SHELL_service_manager_H_
+#ifndef MOJO_SERVICE_MANAGER_SERVICE_MANAGER_H_
+#define MOJO_SERVICE_MANAGER_SERVICE_MANAGER_H_
 
 #include <map>
 
@@ -23,8 +23,7 @@ class ServiceManager {
   class Loader {
    public:
     virtual ~Loader();
-    virtual void Load(const GURL& url,
-                      ScopedShellHandle service_handle) = 0;
+    virtual void Load(const GURL& url, ScopedShellHandle service_handle) = 0;
    protected:
     Loader();
   };
@@ -71,4 +70,4 @@ class ServiceManager {
 }  // namespace shell
 }  // namespace mojo
 
-#endif  // MOJO_SHELL_service_manager_H_
+#endif  // MOJO_SERVICE_MANAGER_SERVICE_MANAGER_H_
diff --git a/mojo/shell/service_manager_unittest.cc b/mojo/service_manager/service_manager_unittest.cc
index 0f17b1d..fba2044 100644
--- a/mojo/shell/service_manager_unittest.cc
+++ b/mojo/service_manager/service_manager_unittest.cc
@@ -8,8 +8,8 @@
 #include "mojo/public/shell/application.h"
 #include "mojo/public/shell/shell.mojom.h"
 #include "mojo/public/utility/run_loop.h"
-#include "mojo/shell/service_manager.h"
-#include "mojo/shell/test.mojom.h"
+#include "mojo/service_manager/service_manager.h"
+#include "mojo/service_manager/test.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
diff --git a/mojo/shell/test.mojom b/mojo/service_manager/test.mojom
index 59ebfa9..59ebfa9 100644
--- a/mojo/shell/test.mojom
+++ b/mojo/service_manager/test.mojom
diff --git a/mojo/shell/android/mojo_main.cc b/mojo/shell/android/mojo_main.cc
index 951742f..987cdfd 100644
--- a/mojo/shell/android/mojo_main.cc
+++ b/mojo/shell/android/mojo_main.cc
@@ -13,11 +13,11 @@
 #include "base/message_loop/message_loop.h"
 #include "jni/MojoMain_jni.h"
 #include "mojo/public/shell/application.h"
+#include "mojo/service_manager/service_manager.h"
 #include "mojo/services/native_viewport/native_viewport_service.h"
 #include "mojo/shell/context.h"
 #include "mojo/shell/init.h"
 #include "mojo/shell/run.h"
-#include "mojo/shell/service_manager.h"
 #include "ui/gl/gl_surface_egl.h"
 
 using base::LazyInstance;
diff --git a/mojo/shell/context.h b/mojo/shell/context.h
index 6bfe1c3..d988ae0 100644
--- a/mojo/shell/context.h
+++ b/mojo/shell/context.h
@@ -5,9 +5,9 @@
 #ifndef MOJO_SHELL_CONTEXT_H_
 #define MOJO_SHELL_CONTEXT_H_
 
+#include "mojo/service_manager/service_manager.h"
 #include "mojo/shell/keep_alive.h"
 #include "mojo/shell/loader.h"
-#include "mojo/shell/service_manager.h"
 #include "mojo/shell/storage.h"
 #include "mojo/shell/task_runners.h"
 
diff --git a/mojo/shell/dynamic_service_loader.h b/mojo/shell/dynamic_service_loader.h
index bdb995c..7337e53 100644
--- a/mojo/shell/dynamic_service_loader.h
+++ b/mojo/shell/dynamic_service_loader.h
@@ -10,8 +10,8 @@
 #include "base/basictypes.h"
 #include "mojo/public/shell/shell.mojom.h"
 #include "mojo/public/system/core_cpp.h"
+#include "mojo/service_manager/service_manager.h"
 #include "mojo/shell/keep_alive.h"
-#include "mojo/shell/service_manager.h"
 #include "url/gurl.h"
 
 namespace mojo {
diff --git a/mojo/shell/run.cc b/mojo/shell/run.cc
index ec92311..edc9c82 100644
--- a/mojo/shell/run.cc
+++ b/mojo/shell/run.cc
@@ -7,9 +7,9 @@
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
+#include "mojo/service_manager/service_manager.h"
 #include "mojo/shell/context.h"
 #include "mojo/shell/keep_alive.h"
-#include "mojo/shell/service_manager.h"
 #include "mojo/shell/switches.h"
 #include "url/gurl.h"
 
diff --git a/mojo/tools/mojob.sh b/mojo/tools/mojob.sh
index ae05015..dc4013a 100755
--- a/mojo/tools/mojob.sh
+++ b/mojo/tools/mojob.sh
@@ -53,7 +53,7 @@ do_unittests() {
   "out/$1/mojo_public_environment_unittests" || exit 1
   "out/$1/mojo_public_system_unittests" || exit 1
   "out/$1/mojo_public_utility_unittests" || exit 1
-  "out/$1/mojo_shell_unittests" || exit 1
+  "out/$1/mojo_service_manager_unittests" || exit 1
   "out/$1/mojo_system_unittests" || exit 1
 }