Create and apply ViewsInteractiveUITestBase

ui/views/widget/native_widget_aura_interactive_uitest.cc

Index: ui/views/widget/native_widget_aura_interactive_uitest.cc
diff --git a/ui/views/widget/native_widget_aura_interactive_uitest.cc b/ui/views/widget/native_widget_aura_interactive_uitest.cc
index 299bc50b71f9c80d1c3dce7cbe59033ef4e49660..834b0dd2abd69efc6264ff1bb3b9e2bd2ddf807c 100644
--- a/ui/views/widget/native_widget_aura_interactive_uitest.cc
+++ b/ui/views/widget/native_widget_aura_interactive_uitest.cc
@@ -4,22 +4,24 @@
 
 #include "ui/views/widget/native_widget_aura.h"
 
-#include "base/path_service.h"
 #include "ui/aura/window.h"
-#include "ui/base/resource/resource_bundle.h"
-#include "ui/base/ui_base_paths.h"
-#include "ui/gl/test/gl_surface_test_support.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/test/native_widget_factory.h"
-#include "ui/views/test/views_test_base.h"
+#include "ui/views/test/views_interactive_ui_test_base.h"
 #include "ui/views/test/widget_test.h"
-#include "ui/views/widget/widget_delegate.h"
 #include "ui/wm/core/base_focus_rules.h"
 #include "ui/wm/core/focus_controller.h"
 
 namespace views {
 namespace test {
 
+namespace {
+
+NativeWidget* CreateNativeWidget(const Widget::InitParams& params,

[sky, 2016/10/24 20:05:03]

optional: nuke the function and call CreatePlatformNativeWidgetImpl() directly.

+                                 Widget* widget) {
+  return CreatePlatformNativeWidgetImpl(params, widget, kDefault, nullptr);
+}
+
 class TestFocusRules : public wm::BaseFocusRules {
  public:
   TestFocusRules() {}
@@ -42,29 +44,9 @@ class TestFocusRules : public wm::BaseFocusRules {
   DISALLOW_COPY_AND_ASSIGN(TestFocusRules);
 };
 
-class NativeWidgetAuraTest : public ViewsTestBase {
- public:
-  NativeWidgetAuraTest() {}
-  ~NativeWidgetAuraTest() override {}
-
-  void SetUp() override {
-    gl::GLSurfaceTestSupport::InitializeOneOff();
-    ui::RegisterPathProvider();
-    base::FilePath ui_test_pak_path;
-    ASSERT_TRUE(PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path));
-    ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path);
+}  // namespace
 
-    ViewsTestBase::SetUp();
-  }
-
-  NativeWidget* CreateNativeWidget(const Widget::InitParams& params,
-                                   Widget* widget) {
-    return CreatePlatformNativeWidgetImpl(params, widget, kDefault, nullptr);
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(NativeWidgetAuraTest);
-};
+typedef ViewsInteractiveUITestBase NativeWidgetAuraTest;

[sky, 2016/10/24 20:05:02]

using

 
 // When requesting view focus from a non-active top level widget, focus is not
 // instantly given. Instead, the view is firstly stored and then it is attempted