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/kill.h" |
| 8 #include "base/process/process_handle.h" |
| 9 #include "base/process/process_iterator.h" |
8 #include "base/test/test_timeouts.h" | 10 #include "base/test/test_timeouts.h" |
9 #include "chrome/browser/service/service_process_control.h" | 11 #include "chrome/browser/service/service_process_control.h" |
10 #include "chrome/browser/ui/browser.h" | 12 #include "chrome/browser/ui/browser.h" |
11 #include "chrome/common/chrome_version_info.h" | 13 #include "chrome/common/chrome_version_info.h" |
12 #include "chrome/common/service_process_util.h" | 14 #include "chrome/common/service_process_util.h" |
13 #include "chrome/test/base/in_process_browser_test.h" | 15 #include "chrome/test/base/in_process_browser_test.h" |
14 #include "chrome/test/base/ui_test_utils.h" | 16 #include "chrome/test/base/ui_test_utils.h" |
15 | 17 |
16 class ServiceProcessControlBrowserTest | 18 class ServiceProcessControlBrowserTest |
17 : public InProcessBrowserTest { | 19 : public InProcessBrowserTest { |
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
201 IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest, CheckPid) { | 203 IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest, CheckPid) { |
202 base::ProcessId service_pid; | 204 base::ProcessId service_pid; |
203 EXPECT_FALSE(GetServiceProcessData(NULL, &service_pid)); | 205 EXPECT_FALSE(GetServiceProcessData(NULL, &service_pid)); |
204 // Launch the service process. | 206 // Launch the service process. |
205 LaunchServiceProcessControl(); | 207 LaunchServiceProcessControl(); |
206 EXPECT_TRUE(GetServiceProcessData(NULL, &service_pid)); | 208 EXPECT_TRUE(GetServiceProcessData(NULL, &service_pid)); |
207 EXPECT_NE(static_cast<base::ProcessId>(0), service_pid); | 209 EXPECT_NE(static_cast<base::ProcessId>(0), service_pid); |
208 // Disconnect from service process. | 210 // Disconnect from service process. |
209 ServiceProcessControl::GetInstance()->Disconnect(); | 211 ServiceProcessControl::GetInstance()->Disconnect(); |
210 } | 212 } |
OLD | NEW |