ShellConnection -> ServiceContext

services/catalog/catalog.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_CATALOG_H_
 #define SERVICES_CATALOG_CATALOG_H_
 
 #include <map>
 #include <memory>
 #include <string>
@@ skipping 11 matching lines @@
 namespace base {
 class SequencedWorkerPool;
 class SingleThreadTaskRunner;
 }
 
 namespace filesystem {
 class LockTable;
 }
 
 namespace shell {
-class ShellConnection;
+class ServiceContext;
 }
 
 namespace catalog {
 
 class Instance;
 class ManifestProvider;
 class Reader;
 class Store;
 
 // Creates and owns an instance of the catalog. Exposes a ServicePtr that
@@ skipping 35 matching lines @@
   void Create(shell::Connection* connection,
               filesystem::mojom::DirectoryRequest request) override;
 
   Instance* GetInstanceForUserId(const std::string& user_id);
 
   void SystemPackageDirScanned();
 
   std::unique_ptr<Store> store_;
 
   shell::mojom::ServicePtr service_;
-  std::unique_ptr<shell::ShellConnection> shell_connection_;
+  std::unique_ptr<shell::ServiceContext> shell_connection_;
 
   std::map<std::string, std::unique_ptr<Instance>> instances_;
 
   std::unique_ptr<Reader> system_reader_;
   EntryCache system_cache_;
   bool loaded_ = false;
 
   scoped_refptr<filesystem::LockTable> lock_table_;
 
   base::WeakPtrFactory<Catalog> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(Catalog);
 };
 
 }  // namespace catalog
 
 #endif  // SERVICES_CATALOG_CATALOG_H_