Split out Ash dependency in app info dialog unittests

ui/views/test/views_test_base.cc

 // Copyright (c) 2012 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 "ui/views/test/views_test_base.h"
 
 #include "base/run_loop.h"
 #include "ui/base/clipboard/clipboard.h"
-#include "ui/base/ime/input_method_initializer.h"
-#include "ui/compositor/test/context_factories_for_test.h"
-#include "ui/views/test/views_test_helper.h"
 
 namespace views {
 
 ViewsTestBase::ViewsTestBase()
     : setup_called_(false),
       teardown_called_(false) {
 }
 
 ViewsTestBase::~ViewsTestBase() {
   CHECK(setup_called_)
       << "You have overridden SetUp but never called super class's SetUp";
   CHECK(teardown_called_)
       << "You have overridden TearDown but never called super class's TearDown";
 }
 
 void ViewsTestBase::SetUp() {
   testing::Test::SetUp();
   setup_called_ = true;
-  if (!views_delegate_)
-    views_delegate_.reset(new TestViewsDelegate());
+  if (!views_delegate_for_setup_)
+    views_delegate_for_setup_.reset(new TestViewsDelegate());
 
-  // The ContextFactory must exist before any Compositors are created.
-  bool enable_pixel_output = false;
-  ui::ContextFactory* context_factory =
-      ui::InitializeContextFactoryForTests(enable_pixel_output);
-  views_delegate_->set_context_factory(context_factory);
-
-  test_helper_.reset(ViewsTestHelper::Create(&message_loop_, context_factory));
-  test_helper_->SetUp();
-  ui::InitializeInputMethodForTesting();
+  test_helper_.reset(
+      new ScopedViewsTestHelper(views_delegate_for_setup_.Pass()));
 }
 
 void ViewsTestBase::TearDown() {
   ui::Clipboard::DestroyClipboardForCurrentThread();
 
   // Flush the message loop because we have pending release tasks
   // and these tasks if un-executed would upset Valgrind.
   RunPendingMessages();
   teardown_called_ = true;
-  views_delegate_.reset();
   testing::Test::TearDown();
-  ui::ShutdownInputMethodForTesting();
-  test_helper_->TearDown();
-  ui::TerminateContextFactoryForTests();
-
-  views_delegate_.reset();
+  test_helper_.reset();
 }
 
 void ViewsTestBase::RunPendingMessages() {
   base::RunLoop run_loop;
   run_loop.RunUntilIdle();
 }
 
 Widget::InitParams ViewsTestBase::CreateParams(
     Widget::InitParams::Type type) {
   Widget::InitParams params(type);
   params.context = GetContext();
   return params;
 }
 
 gfx::NativeWindow ViewsTestBase::GetContext() {
   return test_helper_->GetContext();
 }
 
 }  // namespace views