| Index: ui/views/test/views_test_helper_mac.mm
|
| diff --git a/ui/views/test/views_test_helper.cc b/ui/views/test/views_test_helper_mac.mm
|
| similarity index 51%
|
| copy from ui/views/test/views_test_helper.cc
|
| copy to ui/views/test/views_test_helper_mac.mm
|
| index c0268f4402752a32e11a85c9dcb2ac4c2ec57df6..b0eb85aadd2468741ffe64e8fd0c85461a2f50e4 100644
|
| --- a/ui/views/test/views_test_helper.cc
|
| +++ b/ui/views/test/views_test_helper_mac.mm
|
| @@ -2,32 +2,24 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "ui/views/test/views_test_helper.h"
|
| +#include "ui/views/test/views_test_helper_mac.h"
|
| +
|
| +#include "ui/compositor/scoped_animation_duration_scale_mode.h"
|
|
|
| namespace views {
|
|
|
| -#if !defined(USE_AURA)
|
| // static
|
| ViewsTestHelper* ViewsTestHelper::Create(base::MessageLoopForUI* message_loop,
|
| ui::ContextFactory* context_factory) {
|
| - return new ViewsTestHelper;
|
| -}
|
| -#endif
|
| -
|
| -ViewsTestHelper::ViewsTestHelper() {
|
| -}
|
| -
|
| -ViewsTestHelper::~ViewsTestHelper() {
|
| -}
|
| -
|
| -void ViewsTestHelper::SetUp() {
|
| + return new ViewsTestHelperMac;
|
| }
|
|
|
| -void ViewsTestHelper::TearDown() {
|
| +ViewsTestHelperMac::ViewsTestHelperMac()
|
| + : zero_duration_mode_(new ui::ScopedAnimationDurationScaleMode(
|
| + ui::ScopedAnimationDurationScaleMode::ZERO_DURATION)) {
|
| }
|
|
|
| -gfx::NativeView ViewsTestHelper::GetContext() {
|
| - return NULL;
|
| +ViewsTestHelperMac::~ViewsTestHelperMac() {
|
| }
|
|
|
| } // namespace views
|
|
|