| Index: components/filesystem/file_system_app.h
 | 
| diff --git a/components/filesystem/file_system_app.h b/components/filesystem/file_system_app.h
 | 
| index 3a48bcb128cb8f63f7c6cd40463c106dade64ea9..bca21d2d2f06a1df8e800ed5c1ac5cef1e536b1f 100644
 | 
| --- a/components/filesystem/file_system_app.h
 | 
| +++ b/components/filesystem/file_system_app.h
 | 
| @@ -20,8 +20,9 @@ class Connector;
 | 
|  
 | 
|  namespace filesystem {
 | 
|  
 | 
| -class FileSystemApp : public shell::Service,
 | 
| -                      public shell::InterfaceFactory<mojom::FileSystem> {
 | 
| +class FileSystemApp
 | 
| +    : public service_manager::Service,
 | 
| +      public service_manager::InterfaceFactory<mojom::FileSystem> {
 | 
|   public:
 | 
|    FileSystemApp();
 | 
|    ~FileSystemApp() override;
 | 
| @@ -30,13 +31,13 @@ class FileSystemApp : public shell::Service,
 | 
|    // Gets the system specific toplevel profile directory.
 | 
|    static base::FilePath GetUserDataDir();
 | 
|  
 | 
| -  // |shell::Service| override:
 | 
| -  void OnStart(const shell::Identity& identity) override;
 | 
| -  bool OnConnect(const shell::Identity& remote_identity,
 | 
| -                 shell::InterfaceRegistry* registry) override;
 | 
| +  // |service_manager::Service| override:
 | 
| +  void OnStart(const service_manager::Identity& identity) override;
 | 
| +  bool OnConnect(const service_manager::Identity& remote_identity,
 | 
| +                 service_manager::InterfaceRegistry* registry) override;
 | 
|  
 | 
|    // |InterfaceFactory<Files>| implementation:
 | 
| -  void Create(const shell::Identity& remote_identity,
 | 
| +  void Create(const service_manager::Identity& remote_identity,
 | 
|                mojo::InterfaceRequest<mojom::FileSystem> request) override;
 | 
|  
 | 
|    tracing::Provider tracing_;
 | 
| 
 |