chrome/browser/chromeos/settings/session_manager_operation_unittest.cc - Issue 409743003: Use content::RunBlockingPoolTask() in tests.

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/chromeos/settings/session_manager_operation_unittest.cc

Issue 409743003: Use content::RunBlockingPoolTask() in tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fixed. Created 6 years, 3 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/settings/device_settings_test_helper.cc ('k') | chrome/browser/extensions/crx_installer_browsertest.cc » ('j') | chrome/browser/extensions/extension_garbage_collector_chromeos_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/settings/session_manager_operation_unittest.cc

diff --git a/chrome/browser/chromeos/settings/session_manager_operation_unittest.cc b/chrome/browser/chromeos/settings/session_manager_operation_unittest.cc

index 7c5271d79dee6698a71418850ca26e8a377e949a..9b7a4b7262e030b4c81d5c375c43f02850d48e27 100644

--- a/chrome/browser/chromeos/settings/session_manager_operation_unittest.cc

+++ b/chrome/browser/chromeos/settings/session_manager_operation_unittest.cc

@@ -4,6 +4,9 @@

#include "chrome/browser/chromeos/settings/session_manager_operation.h"

+#include <string>

+#include <vector>

#include "base/basictypes.h"

#include "base/bind.h"

#include "base/bind_helpers.h"

@@ -21,6 +24,7 @@

#include "components/policy/core/common/cloud/cloud_policy_validator.h"

#include "components/policy/core/common/cloud/policy_builder.h"

#include "content/public/test/test_browser_thread.h"

+#include "content/public/test/test_utils.h"

#include "crypto/rsa_private_key.h"

#include "policy/proto/device_management_backend.pb.h"

#include "testing/gmock/include/gmock/gmock.h"

@@ -155,7 +159,7 @@ TEST_F(SessionManagerOperationTest, RestartLoad) {

EXPECT_CALL(*this, OnOperationCompleted(&op, _)).Times(0);

op.Start(&device_settings_test_helper_, owner_key_util_, NULL);

- device_settings_test_helper_.FlushLoops();

+ content::RunAllBlockingPoolTasksUntilIdle();

device_settings_test_helper_.FlushRetrieve();

EXPECT_TRUE(op.public_key().get());

EXPECT_TRUE(op.public_key()->is_loaded());