| Index: net/extras/sqlite/sqlite_persistent_cookie_store_unittest.cc
|
| diff --git a/net/extras/sqlite/sqlite_persistent_cookie_store_unittest.cc b/net/extras/sqlite/sqlite_persistent_cookie_store_unittest.cc
|
| index 8315d74e10e5b8c50fadb41267b5f3d97400455a..58382ebb4ece67c5d07166b4b374b7da2bb54ae6 100644
|
| --- a/net/extras/sqlite/sqlite_persistent_cookie_store_unittest.cc
|
| +++ b/net/extras/sqlite/sqlite_persistent_cookie_store_unittest.cc
|
| @@ -48,7 +48,7 @@ class CookieCryptor : public CookieCryptoDelegate {
|
| bool should_encrypt_;
|
|
|
| private:
|
| - scoped_ptr<crypto::SymmetricKey> key_;
|
| + std::unique_ptr<crypto::SymmetricKey> key_;
|
| crypto::Encryptor encryptor_;
|
| };
|
|
|
| @@ -199,14 +199,14 @@ class SQLitePersistentCookieStoreTest : public testing::Test {
|
| }
|
|
|
| protected:
|
| - scoped_ptr<base::SequencedWorkerPoolOwner> pool_owner_;
|
| + std::unique_ptr<base::SequencedWorkerPoolOwner> pool_owner_;
|
| base::WaitableEvent loaded_event_;
|
| base::WaitableEvent key_loaded_event_;
|
| base::WaitableEvent db_thread_event_;
|
| CanonicalCookieVector cookies_;
|
| base::ScopedTempDir temp_dir_;
|
| scoped_refptr<SQLitePersistentCookieStore> store_;
|
| - scoped_ptr<CookieCryptor> cookie_crypto_delegate_;
|
| + std::unique_ptr<CookieCryptor> cookie_crypto_delegate_;
|
| };
|
|
|
| TEST_F(SQLitePersistentCookieStoreTest, TestInvalidMetaTableRecovery) {
|
|
|