| Index: ash/test/test_suite.h
|
| diff --git a/ash/test/test_suite.h b/ash/test/test_suite.h
|
| index 44e043caadc8cf1ed030fc4cbe0fcdba87f49c62..9540f835c9837e4cca7762a64e9b38b81b4b96c3 100644
|
| --- a/ash/test/test_suite.h
|
| +++ b/ash/test/test_suite.h
|
| @@ -5,12 +5,13 @@
|
| #ifndef ASH_TEST_TEST_SUITE_H_
|
| #define ASH_TEST_TEST_SUITE_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/compiler_specific.h"
|
| #include "base/test/test_discardable_memory_allocator.h"
|
| #include "base/test/test_suite.h"
|
|
|
| #if defined(OS_WIN)
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/win/scoped_com_initializer.h"
|
| #endif
|
|
|
| @@ -29,7 +30,7 @@ class AuraShellTestSuite : public base::TestSuite {
|
|
|
| private:
|
| #if defined(OS_WIN)
|
| - scoped_ptr<base::win::ScopedCOMInitializer> com_initializer_;
|
| + std::unique_ptr<base::win::ScopedCOMInitializer> com_initializer_;
|
| #endif
|
|
|
| base::TestDiscardableMemoryAllocator discardable_memory_allocator_;
|
|
|