Index: chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc |
diff --git a/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc b/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc |
index 1db479c81eab8602559024e4d1595609c8ca66af..e97cdbd42863b5524e7a9449d86cb72e7c10d35f 100644 |
--- a/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc |
+++ b/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc |
@@ -11,6 +11,7 @@ |
#include "base/strings/stringprintf.h" |
#include "chrome/browser/browser_process.h" |
#include "chrome/browser/chromeos/login/test/https_forwarder.h" |
+#include "chrome/browser/chromeos/login/ui/login_display_host.h" |
#include "chrome/browser/chromeos/policy/affiliation_test_helper.h" |
#include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h" |
#include "chrome/browser/extensions/extension_apitest.h" |
@@ -323,6 +324,10 @@ class EnterprisePlatformKeysTest |
void TearDownOnMainThread() override { |
ExtensionApiTest::TearDownOnMainThread(); |
+ if (chromeos::LoginDisplayHost::default_host()) |
+ chromeos::LoginDisplayHost::default_host()->Finalize(); |
+ base::MessageLoop::current()->RunUntilIdle(); |
+ |
if (GetParam().system_token_ == SYSTEM_TOKEN_EXISTS) { |
base::RunLoop loop; |
content::BrowserThread::PostTask( |