Move shell service to toplevel shell namespace

services/shell/background/tests/test_catalog_store.h

Index: services/shell/background/tests/test_catalog_store.h
diff --git a/services/shell/background/tests/test_catalog_store.h b/services/shell/background/tests/test_catalog_store.h
index 763fdc4ea5aedbf43f38e4a4a855e6abaf25fa5b..612075f632bab8a39b309df4705349a8c1c42179 100644
--- a/services/shell/background/tests/test_catalog_store.h
+++ b/services/shell/background/tests/test_catalog_store.h
@@ -5,42 +5,40 @@
 #ifndef SERVICES_SHELL_BACKGROUND_TESTS_TEST_CATALOG_STORE_H_
 #define SERVICES_SHELL_BACKGROUND_TESTS_TEST_CATALOG_STORE_H_
 
+#include <memory>
 #include <string>
 
-#include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "services/catalog/store.h"
 
-namespace mojo {
 namespace shell {
 
 // ApplicationCatalogStore implementation that takes the ListValue to return
 // as store.
 class TestCatalogStore : public catalog::Store {
  public:
-  explicit TestCatalogStore(scoped_ptr<base::ListValue> store);
+  explicit TestCatalogStore(std::unique_ptr<base::ListValue> store);
   ~TestCatalogStore() override;
 
   bool get_store_called() const { return get_store_called_; }
 
   // ApplicationCatalogStore:
   const base::ListValue* GetStore() override;
-  void UpdateStore(scoped_ptr<base::ListValue> store) override;
+  void UpdateStore(std::unique_ptr<base::ListValue> store) override;
 
  private:
   bool get_store_called_ = false;
-  scoped_ptr<base::ListValue> store_;
+  std::unique_ptr<base::ListValue> store_;
 
   DISALLOW_COPY_AND_ASSIGN(TestCatalogStore);
 };
 
 // Returns a dictionary for an app with the specified name, display name and a
 // permissive filter.
-scoped_ptr<base::DictionaryValue> BuildPermissiveSerializedAppInfo(
+std::unique_ptr<base::DictionaryValue> BuildPermissiveSerializedAppInfo(
     const std::string& name,
     const std::string& display_name);
 
 }  // namespace shell
-}  // namespace mojo
 
 #endif  // SERVICES_SHELL_BACKGROUND_TESTS_TEST_CATALOG_STORE_H_