chrome/browser/service_process/service_process_control_browsertest.cc - Issue 1100223002: Update {virtual,override} to follow C++11 style in chrome.

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 1100223002: Update {virtual,override} to follow C++11 style in chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 5 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/shell_integration_win_unittest.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 98f029012c35b4475b1e20dbd224971556d79fd7..5c931fa2bb2e3bce9dba4d969d3161ba461efc72 100644

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

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

@@ -65,14 +65,14 @@ class ServiceProcessControlBrowserTest

ServiceProcessControl::GetInstance()->Disconnect();

}

- virtual void SetUp() override {

+ void SetUp() override {

// This should not be needed because TearDown() ends with a closed

// service_process_, but HistogramsTimeout and Histograms fail without this

// on Mac.

service_process_.Close();

}

- virtual void TearDown() override {

+ void TearDown() override {

if (ServiceProcessControl::GetInstance()->IsConnected())

EXPECT_TRUE(ServiceProcessControl::GetInstance()->Shutdown());

#if defined(OS_MACOSX)