| Index: ui/views/test/views_test_base.cc
|
| diff --git a/ui/views/test/views_test_base.cc b/ui/views/test/views_test_base.cc
|
| index 0222a0fa30bc34a7a0a1d54a0c28ead7d90b884c..239f74bca503a02b3f0fb0e57c97096e78249620 100644
|
| --- a/ui/views/test/views_test_base.cc
|
| +++ b/ui/views/test/views_test_base.cc
|
| @@ -10,6 +10,7 @@
|
| #include "ui/base/clipboard/clipboard.h"
|
| #include "ui/base/material_design/material_design_controller.h"
|
| #include "ui/base/test/material_design_controller_test_api.h"
|
| +#include "ui/views/test/platform_test_helper.h"
|
|
|
| namespace views {
|
|
|
| @@ -25,6 +26,11 @@ ViewsTestBase::~ViewsTestBase() {
|
| << "You have overridden TearDown but never called super class's TearDown";
|
| }
|
|
|
| +// static
|
| +bool ViewsTestBase::IsMus() {
|
| + return PlatformTestHelper::IsMus();
|
| +}
|
| +
|
| void ViewsTestBase::SetUp() {
|
| testing::Test::SetUp();
|
| // ContentTestSuiteBase might have already initialized
|
| @@ -71,8 +77,4 @@ gfx::NativeWindow ViewsTestBase::GetContext() {
|
| return test_helper_->GetContext();
|
| }
|
|
|
| -bool ViewsTestBase::IsMus() const {
|
| - return test_helper_->IsMus();
|
| -}
|
| -
|
| } // namespace views
|
|
|