| Index: sql/connection.h
|
| diff --git a/sql/connection.h b/sql/connection.h
|
| index 4606a1f357c3ae00c0aee789af5dc91487294d99..cebf93b1300c3cbd13ae5a6ac9d92aa3a6c4d6e5 100644
|
| --- a/sql/connection.h
|
| +++ b/sql/connection.h
|
| @@ -8,6 +8,7 @@
|
| #include <stddef.h>
|
| #include <stdint.h>
|
| #include <map>
|
| +#include <memory>
|
| #include <set>
|
| #include <string>
|
| #include <vector>
|
| @@ -17,7 +18,6 @@
|
| #include "base/gtest_prod_util.h"
|
| #include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/threading/thread_restrictions.h"
|
| #include "base/time/time.h"
|
| #include "sql/sql_export.h"
|
| @@ -792,10 +792,10 @@ class SQL_EXPORT Connection {
|
|
|
| // Source for timing information, provided to allow tests to inject time
|
| // changes.
|
| - scoped_ptr<TimeSource> clock_;
|
| + std::unique_ptr<TimeSource> clock_;
|
|
|
| // Stores the dump provider object when db is open.
|
| - scoped_ptr<ConnectionMemoryDumpProvider> memory_dump_provider_;
|
| + std::unique_ptr<ConnectionMemoryDumpProvider> memory_dump_provider_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(Connection);
|
| };
|
|
|