| Index: chrome/app/mash/mash_runner.h
 | 
| diff --git a/chrome/app/mash/mash_runner.h b/chrome/app/mash/mash_runner.h
 | 
| index db20df794dd2e51cb18982b8773e9e9ac75632a7..65b6eabf83a5988f0da84b34ef811c4277724693 100644
 | 
| --- a/chrome/app/mash/mash_runner.h
 | 
| +++ b/chrome/app/mash/mash_runner.h
 | 
| @@ -5,8 +5,9 @@
 | 
|  #ifndef CHROME_APP_MASH_MASH_RUNNER_H_
 | 
|  #define CHROME_APP_MASH_MASH_RUNNER_H_
 | 
|  
 | 
| +#include <memory>
 | 
| +
 | 
|  #include "base/macros.h"
 | 
| -#include "base/memory/scoped_ptr.h"
 | 
|  #include "services/shell/public/interfaces/shell_client.mojom.h"
 | 
|  
 | 
|  namespace shell {
 | 
| @@ -28,8 +29,8 @@ class MashRunner {
 | 
|  
 | 
|    void StartChildApp(shell::mojom::ShellClientRequest client_request);
 | 
|  
 | 
| -  scoped_ptr<shell::ShellClient> shell_client_;
 | 
| -  scoped_ptr<shell::ShellConnection> shell_connection_;
 | 
| +  std::unique_ptr<shell::ShellClient> shell_client_;
 | 
| +  std::unique_ptr<shell::ShellConnection> shell_connection_;
 | 
|  
 | 
|    DISALLOW_COPY_AND_ASSIGN(MashRunner);
 | 
|  };
 | 
| 
 |