| Index: ui/aura/test/event_generator_delegate_aura.cc
|
| diff --git a/ui/aura/test/event_generator_delegate_aura.cc b/ui/aura/test/event_generator_delegate_aura.cc
|
| index fd2ca205e17c7c1267e8f173e184730625682519..f248cb6da9c01d161a56b33f569a06ba24b854a0 100644
|
| --- a/ui/aura/test/event_generator_delegate_aura.cc
|
| +++ b/ui/aura/test/event_generator_delegate_aura.cc
|
| @@ -16,7 +16,7 @@ namespace {
|
| class DefaultEventGeneratorDelegate : public EventGeneratorDelegateAura {
|
| public:
|
| static DefaultEventGeneratorDelegate* GetInstance() {
|
| - return Singleton<DefaultEventGeneratorDelegate>::get();
|
| + return base::Singleton<DefaultEventGeneratorDelegate>::get();
|
| }
|
|
|
| // EventGeneratorDelegate:
|
| @@ -37,7 +37,7 @@ class DefaultEventGeneratorDelegate : public EventGeneratorDelegateAura {
|
| }
|
|
|
| private:
|
| - friend struct DefaultSingletonTraits<DefaultEventGeneratorDelegate>;
|
| + friend struct base::DefaultSingletonTraits<DefaultEventGeneratorDelegate>;
|
|
|
| DefaultEventGeneratorDelegate() : root_window_(NULL) {
|
| DCHECK(!ui::test::EventGenerator::default_delegate);
|
|
|