Move shell service to toplevel shell namespace

services/catalog/entry.h

 // 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.
 
 #ifndef SERVICES_CATALOG_ENTRY_H_
 #define SERVICES_CATALOG_ENTRY_H_
 
 #include <set>
 #include <string>
 
@@ skipping 28 matching lines @@
   const std::string& name() const { return name_; }
   void set_name(const std::string& name) { name_ = name; }
   const base::FilePath& path() const { return path_; }
   void set_path(const base::FilePath& path) { path_ = path; }
   const std::string& qualifier() const { return qualifier_; }
   void set_qualifier(const std::string& qualifier) { qualifier_ = qualifier; }
   const std::string& display_name() const { return display_name_; }
   void set_display_name(const std::string& display_name) {
     display_name_ = display_name;
   }
-  const mojo::CapabilitySpec& capabilities() const { return capabilities_; }
-  void set_capabilities(const mojo::CapabilitySpec& capabilities) {
+  const shell::CapabilitySpec& capabilities() const { return capabilities_; }
+  void set_capabilities(const shell::CapabilitySpec& capabilities) {
     capabilities_ = capabilities;
   }
   const Entry* package() const { return package_; }
   void set_package(Entry* package) { package_ = package; }
   const std::set<Entry*>& applications() { return applications_; }
 
  private:
   std::string name_;
   base::FilePath path_;
   std::string qualifier_;
   std::string display_name_;
-  mojo::CapabilitySpec capabilities_;
+  shell::CapabilitySpec capabilities_;
   Entry* package_ = nullptr;
   std::set<Entry*> applications_;
 };
 
 }  // namespace catalog
 
 namespace mojo {
 template <>
 struct TypeConverter<shell::mojom::ResolveResultPtr, catalog::Entry> {
   static shell::mojom::ResolveResultPtr Convert(const catalog::Entry& input);
 };
 }
 
 #endif  // SERVICES_CATALOG_ENTRY_H_