| Index: chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views_unittest.cc
|
| diff --git a/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views_unittest.cc b/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views_unittest.cc
|
| index 5e06a0e761581c60320013f2759eba2d4586d814..534131722bc0ec1c6f4c71094fca0ab39a299443 100644
|
| --- a/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views_unittest.cc
|
| +++ b/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views_unittest.cc
|
| @@ -5,6 +5,7 @@
|
| #include "chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views.h"
|
|
|
| #include <memory>
|
| +#include <string>
|
|
|
| #include "base/macros.h"
|
| #include "base/run_loop.h"
|
| @@ -22,6 +23,11 @@
|
| #include "ui/views/widget/widget_observer.h"
|
| #include "ui/views/window/dialog_delegate.h"
|
|
|
| +#if defined(OS_CHROMEOS)
|
| +#include "chrome/browser/chromeos/arc/arc_auth_service.h"
|
| +#include "components/arc/test/fake_arc_bridge_service.h"
|
| +#endif
|
| +
|
| namespace test {
|
|
|
| class AppInfoDialogTestApi {
|
| @@ -60,10 +66,17 @@ class AppInfoDialogViewsTest : public BrowserWithTestWindowTest,
|
| // Overridden from testing::Test:
|
| void SetUp() override {
|
| BrowserWithTestWindowTest::SetUp();
|
| +#if defined(OS_CHROMEOS)
|
| + arc::ArcAuthService::DisableUIForTesting();
|
| + bridge_service_ = base::MakeUnique<arc::FakeArcBridgeService>();
|
| + auth_service_ =
|
| + base::MakeUnique<arc::ArcAuthService>(bridge_service_.get());
|
| + auth_service_->OnPrimaryUserProfilePrepared(
|
| + extension_environment_.profile());
|
| +#endif
|
| widget_ = views::DialogDelegate::CreateDialogWidget(
|
| new views::DialogDelegateView(), GetContext(), nullptr);
|
| widget_->AddObserver(this);
|
| -
|
| extension_ = extension_environment_.MakePackagedApp(kTestExtensionId, true);
|
| dialog_ = new AppInfoDialog(widget_->GetNativeWindow(),
|
| extension_environment_.profile(),
|
| @@ -78,6 +91,12 @@ class AppInfoDialogViewsTest : public BrowserWithTestWindowTest,
|
| widget_->CloseNow();
|
| EXPECT_TRUE(widget_destroyed_);
|
| extension_ = nullptr;
|
| +#if defined(OS_CHROMEOS)
|
| + if (auth_service_) {
|
| + auth_service_->Shutdown();
|
| + auth_service_ = nullptr;
|
| + }
|
| +#endif
|
| BrowserWithTestWindowTest::TearDown();
|
| }
|
|
|
| @@ -86,7 +105,14 @@ class AppInfoDialogViewsTest : public BrowserWithTestWindowTest,
|
| return extension_environment_.profile();
|
| }
|
|
|
| - void DestroyProfile(TestingProfile* profile) override {}
|
| + void DestroyProfile(TestingProfile* profile) override {
|
| +#if defined(OS_CHROMEOS)
|
| + if (auth_service_) {
|
| + auth_service_->Shutdown();
|
| + auth_service_ = nullptr;
|
| + }
|
| +#endif
|
| + }
|
|
|
| protected:
|
| // Overridden from views::WidgetObserver:
|
| @@ -110,7 +136,12 @@ class AppInfoDialogViewsTest : public BrowserWithTestWindowTest,
|
| AppInfoDialog* dialog_ = nullptr; // Owned by |widget_|'s views hierarchy.
|
| scoped_refptr<extensions::Extension> extension_;
|
| extensions::TestExtensionEnvironment extension_environment_;
|
| +#if defined(OS_CHROMEOS)
|
| + std::unique_ptr<arc::FakeArcBridgeService> bridge_service_;
|
| + std::unique_ptr<arc::ArcAuthService> auth_service_;
|
| +#endif
|
|
|
| + private:
|
| DISALLOW_COPY_AND_ASSIGN(AppInfoDialogViewsTest);
|
| };
|
|
|
|
|