Split out Ash dependency in app info dialog unittests

chrome/browser/ui/views/desktop_media_picker_views_unittest.cc

Index: chrome/browser/ui/views/desktop_media_picker_views_unittest.cc
diff --git a/chrome/browser/ui/views/desktop_media_picker_views_unittest.cc b/chrome/browser/ui/views/desktop_media_picker_views_unittest.cc
index 50c594cab2be52635b2b0c032de604566112342d..49700c50f69154252002b4096947d8d6f3452cd3 100644
--- a/chrome/browser/ui/views/desktop_media_picker_views_unittest.cc
+++ b/chrome/browser/ui/views/desktop_media_picker_views_unittest.cc
@@ -12,9 +12,8 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/window.h"
-#include "ui/compositor/test/context_factories_for_test.h"
 #include "ui/events/event_utils.h"
-#include "ui/views/test/views_test_helper.h"
+#include "ui/views/test/scoped_views_test_helper.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_delegate.h"
 
@@ -26,16 +25,8 @@ class DesktopMediaPickerViewsTest : public testing::Test {
   ~DesktopMediaPickerViewsTest() override {}
 
   void SetUp() override {
-    bool enable_pixel_output = false;
-    ui::ContextFactory* context_factory =
-        ui::InitializeContextFactoryForTests(enable_pixel_output);
-    test_helper_.reset(
-        ViewsTestHelper::Create(base::MessageLoopForUI::current(),
-                                context_factory));
-    test_helper_->SetUp();
-
     Widget::InitParams params(Widget::InitParams::TYPE_WINDOW);
-    params.context = test_helper_->GetContext();
+    params.context = test_helper_.GetContext();
     params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
     parent_widget_.reset(new Widget);
     parent_widget_->Init(params);
@@ -56,11 +47,6 @@ class DesktopMediaPickerViewsTest : public testing::Test {
                                    base::Unretained(this)));
   }
 
-  void TearDown() override {
-    test_helper_->TearDown();
-    ui::TerminateContextFactoryForTests();
-  }
-
   DesktopMediaPickerDialogView* GetPickerDialogView() const {
     return picker_views_->GetDialogViewForTesting();
   }
@@ -69,7 +55,7 @@ class DesktopMediaPickerViewsTest : public testing::Test {
 
  protected:
   content::TestBrowserThreadBundle thread_bundle_;
-  scoped_ptr<views::ViewsTestHelper> test_helper_;
+  views::ScopedViewsTestHelper test_helper_;
   FakeDesktopMediaList* media_list_;
   scoped_ptr<Widget> parent_widget_;
   scoped_ptr<DesktopMediaPickerViews> picker_views_;