| 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 16befa7c5c36883c2fa9b953be02cd9e32c8a738..d82b753f5caeb4ec6c75160e06e1e9121903180c 100644
|
| --- a/chrome/browser/service_process/service_process_control_browsertest.cc
|
| +++ b/chrome/browser/service_process/service_process_control_browsertest.cc
|
| @@ -68,11 +68,11 @@ class ServiceProcessControlBrowserTest
|
| ServiceProcessControl::GetInstance()->Disconnect();
|
| }
|
|
|
| - virtual void SetUp() OVERRIDE {
|
| + virtual void SetUp() override {
|
| service_process_handle_ = base::kNullProcessHandle;
|
| }
|
|
|
| - virtual void TearDown() OVERRIDE {
|
| + virtual void TearDown() override {
|
| if (ServiceProcessControl::GetInstance()->IsConnected())
|
| EXPECT_TRUE(ServiceProcessControl::GetInstance()->Shutdown());
|
| #if defined(OS_MACOSX)
|
| @@ -118,7 +118,7 @@ class ServiceProcessControlBrowserTest
|
| class RealServiceProcessControlBrowserTest
|
| : public ServiceProcessControlBrowserTest {
|
| public:
|
| - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
|
| + virtual void SetUpCommandLine(CommandLine* command_line) override {
|
| ServiceProcessControlBrowserTest::SetUpCommandLine(command_line);
|
| base::FilePath exe;
|
| PathService::Get(base::DIR_EXE, &exe);
|
|
|