| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/bind_helpers.h" | 6 #include "base/bind_helpers.h" |
| 7 #include "base/process_util.h" | 7 #include "base/process_util.h" |
| 8 #include "base/test/test_timeouts.h" | 8 #include "base/test/test_timeouts.h" |
| 9 #include "chrome/browser/service/service_process_control.h" | 9 #include "chrome/browser/service/service_process_control.h" |
| 10 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
| 11 #include "chrome/common/chrome_version_info.h" | 11 #include "chrome/common/chrome_version_info.h" |
| 12 #include "chrome/common/service_process_util.h" | 12 #include "chrome/common/service_process_util.h" |
| 13 #include "chrome/test/base/in_process_browser_test.h" | 13 #include "chrome/test/base/in_process_browser_test.h" |
| 14 #include "chrome/test/base/ui_test_utils.h" | 14 #include "chrome/test/base/ui_test_utils.h" |
| 15 | 15 |
| 16 class ServiceProcessControlBrowserTest | 16 class ServiceProcessControlBrowserTest |
| 17 : public InProcessBrowserTest { | 17 : public InProcessBrowserTest { |
| 18 public: | 18 public: |
| 19 ServiceProcessControlBrowserTest() | 19 ServiceProcessControlBrowserTest() |
| 20 : service_process_handle_(base::kNullProcessHandle) { | 20 : service_process_handle_(base::kNullProcessHandle) { |
| 21 } | 21 } |
| 22 ~ServiceProcessControlBrowserTest() { | 22 virtual ~ServiceProcessControlBrowserTest() { |
| 23 base::CloseProcessHandle(service_process_handle_); | 23 base::CloseProcessHandle(service_process_handle_); |
| 24 service_process_handle_ = base::kNullProcessHandle; | 24 service_process_handle_ = base::kNullProcessHandle; |
| 25 } | 25 } |
| 26 | 26 |
| 27 #if defined(OS_MACOSX) | 27 #if defined(OS_MACOSX) |
| 28 virtual void TearDown() { | 28 virtual void TearDown() { |
| 29 // ForceServiceProcessShutdown removes the process from launched on Mac. | 29 // ForceServiceProcessShutdown removes the process from launched on Mac. |
| 30 ForceServiceProcessShutdown("", 0); | 30 ForceServiceProcessShutdown("", 0); |
| 31 } | 31 } |
| 32 #endif // OS_MACOSX | 32 #endif // OS_MACOSX |
| (...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 198 IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest, CheckPid) { | 198 IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest, CheckPid) { |
| 199 base::ProcessId service_pid; | 199 base::ProcessId service_pid; |
| 200 EXPECT_FALSE(GetServiceProcessData(NULL, &service_pid)); | 200 EXPECT_FALSE(GetServiceProcessData(NULL, &service_pid)); |
| 201 // Launch the service process. | 201 // Launch the service process. |
| 202 LaunchServiceProcessControl(); | 202 LaunchServiceProcessControl(); |
| 203 EXPECT_TRUE(GetServiceProcessData(NULL, &service_pid)); | 203 EXPECT_TRUE(GetServiceProcessData(NULL, &service_pid)); |
| 204 EXPECT_NE(static_cast<base::ProcessId>(0), service_pid); | 204 EXPECT_NE(static_cast<base::ProcessId>(0), service_pid); |
| 205 // Disconnect from service process. | 205 // Disconnect from service process. |
| 206 ServiceProcessControl::GetInstance()->Disconnect(); | 206 ServiceProcessControl::GetInstance()->Disconnect(); |
| 207 } | 207 } |
| OLD | NEW |