Move shell service to toplevel shell namespace

services/catalog/entry_unittest.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "services/catalog/entry.h"
 
 #include "base/files/file_path.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/macros.h"
 #include "base/path_service.h"
@@ skipping 38 matching lines @@
  private:
   void SetUp() override {}
   void TearDown() override {}
 
   DISALLOW_COPY_AND_ASSIGN(EntryTest);
 };
 
 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());
 }
 
 TEST_F(EntryTest, Instance) {
   scoped_ptr<Entry> entry = ReadEntry("instance", nullptr);
   EXPECT_EQ("mojo:foo", entry->name());
   EXPECT_EQ("bar", entry->qualifier());
   EXPECT_EQ("Foo", entry->display_name());
 }
 
 TEST_F(EntryTest, Capabilities) {
   scoped_ptr<Entry> entry = ReadEntry("capabilities", nullptr);
 
   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());
 }
 
 TEST_F(EntryTest, Serialization) {
   scoped_ptr<base::Value> value;
   scoped_ptr<Entry> entry = ReadEntry("serialization", &value);
 
   scoped_ptr<base::DictionaryValue> serialized(entry->Serialize());
 
   // We can't just compare values, since during deserialization some of the
   // lists get converted to std::sets, which are sorted, so Value::Equals will
   // fail.
   scoped_ptr<Entry> reconstituted = Entry::Deserialize(*serialized.get());
   EXPECT_EQ(*entry, *reconstituted);
 }
 
 TEST_F(EntryTest, Malformed) {
   scoped_ptr<base::Value> value = ReadManifest("malformed");
   EXPECT_FALSE(value.get());
 }
 
 
 }  // namespace catalog