| Index: base/test/test_reg_util_win.h
|
| diff --git a/base/test/test_reg_util_win.h b/base/test/test_reg_util_win.h
|
| index 69f5fdded7dab99115fc1108ec361aacfd7baf7a..587e28f3f847cb0cfe635574ab8ca5725272ea7f 100644
|
| --- a/base/test/test_reg_util_win.h
|
| +++ b/base/test/test_reg_util_win.h
|
| @@ -6,10 +6,10 @@
|
| #define BASE_TEST_TEST_REG_UTIL_WIN_H_
|
|
|
| // Registry utility functions used only by tests.
|
| +#include <memory>
|
| #include <vector>
|
|
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/strings/string16.h"
|
| #include "base/time/time.h"
|
| #include "base/win/registry.h"
|
| @@ -64,7 +64,7 @@ class RegistryOverrideManager {
|
| base::string16 guid_;
|
|
|
| base::string16 test_key_root_;
|
| - std::vector<scoped_ptr<ScopedRegistryKeyOverride>> overrides_;
|
| + std::vector<std::unique_ptr<ScopedRegistryKeyOverride>> overrides_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(RegistryOverrideManager);
|
| };
|
|
|