chrome/browser/sync/test/integration/single_client_directory_sync_test.cc - Issue 2835233002: Fix integration tests in src/chrome and src/extensions so that we can turn on IO thread checks wi...

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/sync/test/integration/single_client_directory_sync_test.cc

Issue 2835233002: Fix integration tests in src/chrome and src/extensions so that we can turn on IO thread checks wi... (Closed)

Patch Set: ready for review Created 3 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/sync/test/integration/bookmarks_helper.cc ('k') | chrome/browser/sync/test/integration/sync_extension_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/test/integration/single_client_directory_sync_test.cc

diff --git a/chrome/browser/sync/test/integration/single_client_directory_sync_test.cc b/chrome/browser/sync/test/integration/single_client_directory_sync_test.cc

index 1768ca8ccfe8576dc4657f39652a7ea3abda8513..ddf9c6f8d8b8852f9884b1b03549f302a576a3e6 100644

--- a/chrome/browser/sync/test/integration/single_client_directory_sync_test.cc

+++ b/chrome/browser/sync/test/integration/single_client_directory_sync_test.cc

@@ -10,6 +10,7 @@

#include "base/single_thread_task_runner.h"

#include "base/strings/string_number_conversions.h"

#include "base/synchronization/waitable_event.h"

+#include "base/threading/thread_restrictions.h"

#include "base/threading/thread_task_runner_handle.h"

#include "base/time/time.h"

#include "chrome/browser/sync/test/integration/bookmarks_helper.h"

@@ -33,6 +34,7 @@ namespace {

// will avoid seeing any of those, and return iff Directory database files still

// exist.

bool FolderContainsFiles(const FilePath& folder) {

+ base::ThreadRestrictions::ScopedAllowIO allow_io;

if (base::DirectoryExists(folder)) {

return !FileEnumerator(folder, false, FileEnumerator::FILES).Next().empty();

} else {