Move shell service to toplevel shell namespace

services/catalog/entry_unittest.cc

Index: services/catalog/entry_unittest.cc
diff --git a/services/catalog/entry_unittest.cc b/services/catalog/entry_unittest.cc
index 47e286d8172cdf11b092e0e6acb35e823f39f4bc..c1dcc3300047fc579a50aadaf59aab97709d082d 100644
--- a/services/catalog/entry_unittest.cc
+++ b/services/catalog/entry_unittest.cc
@@ -56,7 +56,7 @@ class EntryTest : public testing::Test {
 TEST_F(EntryTest, Simple) {
   scoped_ptr<Entry> entry = ReadEntry("simple", nullptr);
   EXPECT_EQ("mojo:foo", entry->name());
-  EXPECT_EQ(mojo::GetNamePath(entry->name()), entry->qualifier());
+  EXPECT_EQ(shell::GetNamePath(entry->name()), entry->qualifier());
   EXPECT_EQ("Foo", entry->display_name());
 }
 
@@ -73,8 +73,8 @@ TEST_F(EntryTest, Capabilities) {
   EXPECT_EQ("mojo:foo", entry->name());
   EXPECT_EQ("bar", entry->qualifier());
   EXPECT_EQ("Foo", entry->display_name());
-  mojo::CapabilitySpec spec;
-  mojo::CapabilityRequest request;
+  shell::CapabilitySpec spec;
+  shell::CapabilityRequest request;
   request.interfaces.insert("mojo::Bar");
   spec.required["mojo:bar"] = request;
   EXPECT_EQ(spec, entry->capabilities());