| Index: chrome/browser/ui/android/autofill/autofill_dialog_result.h
|
| diff --git a/chrome/browser/ui/android/autofill/autofill_dialog_result.h b/chrome/browser/ui/android/autofill/autofill_dialog_result.h
|
| index b0420e4c467f2cdf9a337f17999c8bd5d2418da9..c90336be8bf6f04280a0777b440c853e70cfa986 100644
|
| --- a/chrome/browser/ui/android/autofill/autofill_dialog_result.h
|
| +++ b/chrome/browser/ui/android/autofill/autofill_dialog_result.h
|
| @@ -6,10 +6,11 @@
|
| #define CHROME_BROWSER_UI_ANDROID_AUTOFILL_AUTOFILL_DIALOG_RESULT_H_
|
|
|
| #include <jni.h>
|
| +
|
| +#include <memory>
|
| #include <string>
|
|
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/strings/string16.h"
|
|
|
| namespace autofill {
|
| @@ -27,8 +28,8 @@ class AutofillDialogResult {
|
| // Converts the requested information to wallet::FullWallet.
|
| // The dialog stores the requested information in the same format
|
| // regardless if the information was obtained from Autofill or Google Wallet.
|
| - static scoped_ptr<wallet::FullWallet> ConvertFromJava(
|
| - JNIEnv* env, jobject wallet);
|
| + static std::unique_ptr<wallet::FullWallet> ConvertFromJava(JNIEnv* env,
|
| + jobject wallet);
|
|
|
| // Returns the email address to be associated with this request,
|
| // or an empty string.
|
|
|