| Index: chrome/app/android/chrome_main_delegate_android.h
|
| diff --git a/chrome/app/android/chrome_main_delegate_android.h b/chrome/app/android/chrome_main_delegate_android.h
|
| index 226c086a7ce19663f9742326b8a13171d8be3bda..6e68170e76e1e7316f689dde8f31405145ccbc1f 100644
|
| --- a/chrome/app/android/chrome_main_delegate_android.h
|
| +++ b/chrome/app/android/chrome_main_delegate_android.h
|
| @@ -5,8 +5,9 @@
|
| #ifndef CHROME_APP_ANDROID_CHROME_MAIN_DELEGATE_ANDROID_H_
|
| #define CHROME_APP_ANDROID_CHROME_MAIN_DELEGATE_ANDROID_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "chrome/app/chrome_main_delegate.h"
|
| #include "content/public/browser/browser_main_runner.h"
|
|
|
| @@ -35,10 +36,11 @@ class ChromeMainDelegateAndroid : public ChromeMainDelegate {
|
| #endif
|
|
|
| private:
|
| - scoped_ptr<content::BrowserMainRunner> browser_runner_;
|
| + std::unique_ptr<content::BrowserMainRunner> browser_runner_;
|
|
|
| #if defined(SAFE_BROWSING_DB_REMOTE)
|
| - scoped_ptr<safe_browsing::SafeBrowsingApiHandler> safe_browsing_api_handler_;
|
| + std::unique_ptr<safe_browsing::SafeBrowsingApiHandler>
|
| + safe_browsing_api_handler_;
|
| #endif
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ChromeMainDelegateAndroid);
|
|
|