| Index: cc/test/animation_timelines_test_common.h
|
| diff --git a/cc/test/animation_timelines_test_common.h b/cc/test/animation_timelines_test_common.h
|
| index 518929d6abc8804f17b9f9c6901c29fdebba3695..7f06da0112b7e309a52a4e63c409c9a68f7a050b 100644
|
| --- a/cc/test/animation_timelines_test_common.h
|
| +++ b/cc/test/animation_timelines_test_common.h
|
| @@ -5,7 +5,8 @@
|
| #ifndef CC_TEST_ANIMATION_TIMELINES_TEST_COMMON_H_
|
| #define CC_TEST_ANIMATION_TIMELINES_TEST_COMMON_H_
|
|
|
| -#include "base/containers/scoped_ptr_hash_map.h"
|
| +#include <unordered_map>
|
| +
|
| #include "base/memory/scoped_ptr.h"
|
| #include "cc/animation/animation.h"
|
| #include "cc/animation/animation_delegate.h"
|
| @@ -134,7 +135,7 @@ class TestHostClient : public MutatorHostClient {
|
| private:
|
| scoped_ptr<AnimationHost> host_;
|
|
|
| - typedef base::ScopedPtrHashMap<int, scoped_ptr<TestLayer>> LayerIdToTestLayer;
|
| + typedef std::unordered_map<int, scoped_ptr<TestLayer>> LayerIdToTestLayer;
|
| LayerIdToTestLayer layers_in_active_tree_;
|
| LayerIdToTestLayer layers_in_pending_tree_;
|
|
|
|
|