Move shell service to toplevel shell namespace

services/shell/background/tests/test_catalog_store.cc

Index: services/shell/background/tests/test_catalog_store.cc
diff --git a/services/shell/background/tests/test_catalog_store.cc b/services/shell/background/tests/test_catalog_store.cc
index 902e3a535319b833597adfd7d3cf0137359f0726..aa2f2795970eb39accade6b3b0b38d8b58324767 100644
--- a/services/shell/background/tests/test_catalog_store.cc
+++ b/services/shell/background/tests/test_catalog_store.cc
@@ -6,10 +6,9 @@
 
 using catalog::Store;
 
-namespace mojo {
 namespace shell {
 
-TestCatalogStore::TestCatalogStore(scoped_ptr<base::ListValue> store)
+TestCatalogStore::TestCatalogStore(std::unique_ptr<base::ListValue> store)
     : store_(std::move(store)) {}
 
 TestCatalogStore::~TestCatalogStore() {}
@@ -19,23 +18,23 @@ const base::ListValue* TestCatalogStore::GetStore() {
   return store_.get();
 }
 
-void TestCatalogStore::UpdateStore(
-    scoped_ptr<base::ListValue> store) {}
+void TestCatalogStore::UpdateStore(std::unique_ptr<base::ListValue> store) {}
 
-scoped_ptr<base::DictionaryValue> BuildPermissiveSerializedAppInfo(
+std::unique_ptr<base::DictionaryValue> BuildPermissiveSerializedAppInfo(
     const std::string& name,
     const std::string& display_name) {
-  scoped_ptr<base::DictionaryValue> app(new base::DictionaryValue);
+  std::unique_ptr<base::DictionaryValue> app(new base::DictionaryValue);
   app->SetString(Store::kNameKey, name);
   app->SetString(Store::kDisplayNameKey, display_name);
   app->SetInteger(Store::kManifestVersionKey, 1);
 
-  scoped_ptr<base::DictionaryValue> capabilities(new base::DictionaryValue);
-  scoped_ptr<base::DictionaryValue> required_capabilities(
+  std::unique_ptr<base::DictionaryValue> capabilities(
       new base::DictionaryValue);
-  scoped_ptr<base::DictionaryValue> interfaces_dictionary(
+  std::unique_ptr<base::DictionaryValue> required_capabilities(
       new base::DictionaryValue);
-  scoped_ptr<base::ListValue> interfaces_list(new base::ListValue);
+  std::unique_ptr<base::DictionaryValue> interfaces_dictionary(
+      new base::DictionaryValue);
+  std::unique_ptr<base::ListValue> interfaces_list(new base::ListValue);
   interfaces_list->AppendString("*");
   interfaces_dictionary->Set("interfaces", std::move(interfaces_list));
   required_capabilities->Set("*", std::move(interfaces_dictionary));
@@ -46,4 +45,3 @@ scoped_ptr<base::DictionaryValue> BuildPermissiveSerializedAppInfo(
 }
 
 }  // namespace shell
-}  // namespace mojo