chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc - Issue 1887953002: Revert of [Merge to M50] Enable bootstrapping feature by default.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc

Issue 1887953002: Revert of [Merge to M50] Enable bootstrapping feature by default. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2661

Patch Set: Created 4 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/login/wizard_controller.cc ('k') | chrome/browser/ui/webui/chromeos/login/controller_pairing_screen_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 e97cdbd42863b5524e7a9449d86cb72e7c10d35f..1db479c81eab8602559024e4d1595609c8ca66af 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,7 +11,6 @@

#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"

@@ -324,10 +323,6 @@

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(