| Index: chrome/utility/importer/firefox_importer_unittest_utils.h
|
| diff --git a/chrome/utility/importer/firefox_importer_unittest_utils.h b/chrome/utility/importer/firefox_importer_unittest_utils.h
|
| index a0b3e689d60ca63838f898dd76d9cf3b83065540..f368dae11ab624d455d21c912d949b1f0c1d3c89 100644
|
| --- a/chrome/utility/importer/firefox_importer_unittest_utils.h
|
| +++ b/chrome/utility/importer/firefox_importer_unittest_utils.h
|
| @@ -5,9 +5,10 @@
|
| #ifndef CHROME_UTILITY_IMPORTER_FIREFOX_IMPORTER_UNITTEST_UTILS_H_
|
| #define CHROME_UTILITY_IMPORTER_FIREFOX_IMPORTER_UNITTEST_UTILS_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/files/file_util.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/process/process.h"
|
| #include "build/build_config.h"
|
| #include "chrome/utility/importer/nss_decryptor.h"
|
| @@ -59,9 +60,9 @@ class FFUnitTestDecryptorProxy {
|
| bool WaitForClientResponse();
|
|
|
| base::Process child_process_;
|
| - scoped_ptr<IPC::Channel> channel_;
|
| - scoped_ptr<FFDecryptorServerChannelListener> listener_;
|
| - scoped_ptr<base::MessageLoopForIO> message_loop_;
|
| + std::unique_ptr<IPC::Channel> channel_;
|
| + std::unique_ptr<FFDecryptorServerChannelListener> listener_;
|
| + std::unique_ptr<base::MessageLoopForIO> message_loop_;
|
| #else
|
| NSSDecryptor decryptor_;
|
| #endif // !OS_MACOSX
|
|
|