| Index: base/test/test_suite.h
|
| diff --git a/base/test/test_suite.h b/base/test/test_suite.h
|
| index 68590ebba0ee5688d2cb6e834d69e0e72e7ea5df..deef72d5638d8b28452b26ae41bb1775b71f7a1a 100644
|
| --- a/base/test/test_suite.h
|
| +++ b/base/test/test_suite.h
|
| @@ -9,11 +9,11 @@
|
| // instantiate this class in your main function and call its Run method to run
|
| // any gtest based tests that are linked into your executable.
|
|
|
| +#include <memory>
|
| #include <string>
|
|
|
| #include "base/at_exit.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/test/trace_to_file.h"
|
| #include "build/build_config.h"
|
|
|
| @@ -67,7 +67,7 @@ class TestSuite {
|
|
|
| // Make sure that we setup an AtExitManager so Singleton objects will be
|
| // destroyed.
|
| - scoped_ptr<base::AtExitManager> at_exit_manager_;
|
| + std::unique_ptr<base::AtExitManager> at_exit_manager_;
|
|
|
| private:
|
| void InitializeFromCommandLine(int argc, char** argv);
|
|
|