Split out Ash dependency in app info dialog unittests

chrome/browser/ui/views/desktop_media_picker_views_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/media/fake_desktop_media_list.h"
 #include "chrome/browser/ui/views/desktop_media_picker_views.h"
 #include "components/web_modal/test_web_contents_modal_dialog_host.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #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"
 
 namespace views {
 
 class DesktopMediaPickerViewsTest : public testing::Test {
  public:
   DesktopMediaPickerViewsTest() {}
   ~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);
 
     media_list_ = new FakeDesktopMediaList();
     scoped_ptr<FakeDesktopMediaList> media_list(media_list_);
 
     base::string16 app_name = base::ASCIIToUTF16("foo");
 
     picker_views_.reset(new DesktopMediaPickerViews());
     picker_views_->Show(NULL,
                         parent_widget_->GetNativeWindow(),
                         NULL,
                         app_name,
                         app_name,
                         media_list.Pass(),
                         base::Bind(&DesktopMediaPickerViewsTest::OnPickerDone,
                                    base::Unretained(this)));
   }
 
-  void TearDown() override {
-    test_helper_->TearDown();
-    ui::TerminateContextFactoryForTests();
-  }
-
   DesktopMediaPickerDialogView* GetPickerDialogView() const {
     return picker_views_->GetDialogViewForTesting();
   }
 
   MOCK_METHOD1(OnPickerDone, void(content::DesktopMediaID));
 
  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_;
 };
 
 TEST_F(DesktopMediaPickerViewsTest, DoneCallbackCalledWhenWindowClosed) {
   EXPECT_CALL(*this, OnPickerDone(content::DesktopMediaID()));
 
   GetPickerDialogView()->GetWidget()->Close();
   base::RunLoop().RunUntilIdle();
@@ skipping 110 matching lines @@
   GetPickerDialogView()->GetMediaSourceViewForTesting(0)->OnFocus();
   EXPECT_TRUE(
       GetPickerDialogView()->IsDialogButtonEnabled(ui::DIALOG_BUTTON_OK));
 
   media_list_->RemoveSource(0);
   EXPECT_FALSE(
       GetPickerDialogView()->IsDialogButtonEnabled(ui::DIALOG_BUTTON_OK));
 }
 
 }  // namespace views