chrome/browser/chromeos/drive/drive_integration_service_unittest.cc - Issue 380993002: Upstream RunBlockingPoolTask().

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/drive/drive_integration_service_unittest.cc

Issue 380993002: Upstream RunBlockingPoolTask(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Addressed comments. Created 6 years, 5 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/drive/drive_file_stream_reader_unittest.cc ('k') | chrome/browser/chromeos/drive/file_system/copy_operation_unittest.cc » ('j') | content/public/test/test_utils.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/drive/drive_integration_service_unittest.cc

diff --git a/chrome/browser/chromeos/drive/drive_integration_service_unittest.cc b/chrome/browser/chromeos/drive/drive_integration_service_unittest.cc

index 07b6d0bda2d23e0d21073bd1bafbb4a061c32a72..b886726beb03991a65f2e651c2d2a2393f7596a2 100644

--- a/chrome/browser/chromeos/drive/drive_integration_service_unittest.cc

+++ b/chrome/browser/chromeos/drive/drive_integration_service_unittest.cc

@@ -5,12 +5,12 @@

#include "chrome/browser/chromeos/drive/drive_integration_service.h"

#include "chrome/browser/chromeos/drive/dummy_file_system.h"

-#include "chrome/browser/chromeos/drive/test_util.h"

#include "chrome/browser/drive/dummy_drive_service.h"

#include "chrome/test/base/testing_browser_process.h"

#include "chrome/test/base/testing_profile.h"

#include "chrome/test/base/testing_profile_manager.h"

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

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

#include "testing/gtest/include/gtest/gtest.h"

namespace drive {

@@ -47,7 +47,7 @@ TEST_F(DriveIntegrationServiceTest, InitializeAndShutdown) {

base::FilePath(),

new DummyFileSystem));

integration_service->SetEnabled(true);

- test_util::RunBlockingPoolTask();

+ content::RunAllBlockingPoolTasksUntilIdle();

integration_service->Shutdown();

}