| Index: chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_ash_unittest.cc
|
| diff --git a/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_ash_unittest.cc b/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_ash_unittest.cc
|
| index 49efa1ffc33c7794a7e8467a768230b69c7b41fd..71208cbfc2501deb599f2a50a5ce703e6e5ff9de 100644
|
| --- a/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_ash_unittest.cc
|
| +++ b/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_ash_unittest.cc
|
| @@ -12,13 +12,6 @@
|
| #include "ui/views/widget/widget.h"
|
| #include "ui/views/window/dialog_delegate.h"
|
|
|
| -#if defined(OS_CHROMEOS)
|
| -#include "base/memory/ptr_util.h"
|
| -#include "chrome/browser/chromeos/arc/arc_session_manager.h"
|
| -#include "components/arc/arc_session_runner.h"
|
| -#include "components/arc/test/fake_arc_session.h"
|
| -#endif
|
| -
|
| namespace {
|
|
|
| const char kTestExtensionId[] = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
|
| @@ -33,14 +26,6 @@ class AppInfoDialogAshTest : public ash::test::AshTestBase {
|
| // Overridden from testing::Test:
|
| void SetUp() override {
|
| ash::test::AshTestBase::SetUp();
|
| -#if defined(OS_CHROMEOS)
|
| - arc::ArcSessionManager::DisableUIForTesting();
|
| - arc_session_manager_ = base::MakeUnique<arc::ArcSessionManager>(
|
| - base::MakeUnique<arc::ArcSessionRunner>(
|
| - base::Bind(arc::FakeArcSession::Create)));
|
| - arc_session_manager_->OnPrimaryUserProfilePrepared(
|
| - extension_environment_.profile());
|
| -#endif
|
| widget_ = views::DialogDelegate::CreateDialogWidget(
|
| new views::DialogDelegateView(), CurrentContext(), NULL);
|
| dialog_ = new AppInfoDialog(
|
| @@ -52,10 +37,6 @@ class AppInfoDialogAshTest : public ash::test::AshTestBase {
|
|
|
| void TearDown() override {
|
| widget_->CloseNow();
|
| -#if defined(OS_CHROMEOS)
|
| - if (arc_session_manager_)
|
| - arc_session_manager_->Shutdown();
|
| -#endif
|
| ash::test::AshTestBase::TearDown();
|
| }
|
|
|
| @@ -63,9 +44,6 @@ class AppInfoDialogAshTest : public ash::test::AshTestBase {
|
| extensions::TestExtensionEnvironment extension_environment_;
|
| views::Widget* widget_ = nullptr;
|
| AppInfoDialog* dialog_ = nullptr; // Owned by |widget_|'s views hierarchy.
|
| -#if defined(OS_CHROMEOS)
|
| - std::unique_ptr<arc::ArcSessionManager> arc_session_manager_;
|
| -#endif
|
|
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(AppInfoDialogAshTest);
|
|
|