chrome/browser/service_process/service_process_control_browsertest.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/service_process/service_process_control_browsertest.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/safe_browsing/safe_browsing_service_browsertest.cc ('k') | chrome/browser/sessions/session_restore_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/service_process/service_process_control_browsertest.cc

diff --git a/chrome/browser/service_process/service_process_control_browsertest.cc b/chrome/browser/service_process/service_process_control_browsertest.cc

index 9a07250152f61dbd01a6721f5f24e3ec093ce5e9..a9340b1df4672a3b120efbc6ce0581ff9c83fb42 100644

--- a/chrome/browser/service_process/service_process_control_browsertest.cc

+++ b/chrome/browser/service_process/service_process_control_browsertest.cc

@@ -14,6 +14,7 @@

#include "base/process/process_iterator.h"

#include "base/single_thread_task_runner.h"

#include "base/test/test_timeouts.h"

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

#include "base/threading/thread_task_runner_handle.h"

#include "build/build_config.h"

#include "chrome/browser/ui/browser.h"

@@ -99,6 +100,7 @@ class ServiceProcessControlBrowserTest

}

void ProcessControlLaunched() {

+ base::ThreadRestrictions::ScopedAllowIO allow_io;

base::ProcessId service_pid;

EXPECT_TRUE(GetServiceProcessData(NULL, &service_pid));

EXPECT_NE(static_cast<base::ProcessId>(0), service_pid);

@@ -304,6 +306,7 @@ IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest, MAYBE_ForceShutdown) {

// Make sure we are connected to the service process.

ASSERT_TRUE(ServiceProcessControl::GetInstance()->IsConnected());

base::ProcessId service_pid;

+ base::ThreadRestrictions::ScopedAllowIO allow_io;

EXPECT_TRUE(GetServiceProcessData(NULL, &service_pid));

EXPECT_NE(static_cast<base::ProcessId>(0), service_pid);

ForceServiceProcessShutdown(version_info::GetVersionNumber(), service_pid);

@@ -317,6 +320,7 @@ IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest, MAYBE_ForceShutdown) {

#endif

IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest, MAYBE_CheckPid) {

base::ProcessId service_pid;

+ base::ThreadRestrictions::ScopedAllowIO allow_io;

EXPECT_FALSE(GetServiceProcessData(NULL, &service_pid));

// Launch the service process.

LaunchServiceProcessControl(true);