Get rid of the services namespace and move the service into the service sub-namespace

TBR=sky@chromium.org
http://crbug.com/365012

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

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

2 files changed, 5 insertions, 5 deletions

diff --git a/mojo/shell/view_manager_loader.cc b/mojo/shell/view_manager_loader.cc
index 05fea7a..cd24638 100644
--- a/mojo/shell/view_manager_loader.cc
+++ b/mojo/shell/view_manager_loader.cc
@@ -23,11 +23,11 @@ void ViewManagerLoader::LoadService(ServiceManager* manager,
   scoped_ptr<Application> app(new Application(shell_handle.Pass()));
   if (!root_node_manager_.get()) {
     root_node_manager_.reset(
-        new services::view_manager::RootNodeManager(app->shell()));
+        new view_manager::service::RootNodeManager(app->shell()));
   }
   app->AddServiceConnector(
-      new ServiceConnector<services::view_manager::ViewManagerConnection,
-                           services::view_manager::RootNodeManager>(
+      new ServiceConnector<view_manager::service::ViewManagerConnection,
+                           view_manager::service::RootNodeManager>(
                                root_node_manager_.get()));
   apps_.push_back(app.release());
 }
diff --git a/mojo/shell/view_manager_loader.h b/mojo/shell/view_manager_loader.h
index 7276835..f4927c5 100644
--- a/mojo/shell/view_manager_loader.h
+++ b/mojo/shell/view_manager_loader.h
@@ -10,8 +10,8 @@
 #include "mojo/service_manager/service_loader.h"
 
 namespace mojo {
-namespace services {
 namespace view_manager {
+namespace service {
 class RootNodeManager;
 }
 }
@@ -34,7 +34,7 @@ class ViewManagerLoader : public ServiceLoader {
   virtual void OnServiceError(ServiceManager* manager,
                               const GURL& url) OVERRIDE;
 
-  scoped_ptr<services::view_manager::RootNodeManager> root_node_manager_;
+  scoped_ptr<view_manager::service::RootNodeManager> root_node_manager_;
   ScopedVector<Application> apps_;
 
   DISALLOW_COPY_AND_ASSIGN(ViewManagerLoader);