Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(160)

Side by Side Diff: chrome/browser/service/service_process_control_browsertest.cc

Issue 6293019: Disable forceshutdown. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/process_util.h" 5 #include "base/process_util.h"
6 #include "base/test/test_timeouts.h" 6 #include "base/test/test_timeouts.h"
7 #include "chrome/browser/service/service_process_control.h" 7 #include "chrome/browser/service/service_process_control.h"
8 #include "chrome/browser/service/service_process_control_manager.h" 8 #include "chrome/browser/service/service_process_control_manager.h"
9 #include "chrome/browser/ui/browser.h" 9 #include "chrome/browser/ui/browser.h"
10 #include "chrome/common/chrome_version_info.h" 10 #include "chrome/common/chrome_version_info.h"
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 // to die. 179 // to die.
180 IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest, DieOnDisconnect) { 180 IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest, DieOnDisconnect) {
181 // Launch the service process. 181 // Launch the service process.
182 LaunchServiceProcessControl(); 182 LaunchServiceProcessControl();
183 // Make sure we are connected to the service process. 183 // Make sure we are connected to the service process.
184 EXPECT_TRUE(process()->is_connected()); 184 EXPECT_TRUE(process()->is_connected());
185 Disconnect(); 185 Disconnect();
186 WaitForShutdown(); 186 WaitForShutdown();
187 } 187 }
188 188
189 IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest, ForceShutdown) { 189 //http://code.google.com/p/chromium/issues/detail?id=70793
190 IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest,
191 DISABLED_ForceShutdown) {
190 // Launch the service process. 192 // Launch the service process.
191 LaunchServiceProcessControl(); 193 LaunchServiceProcessControl();
192 // Make sure we are connected to the service process. 194 // Make sure we are connected to the service process.
193 EXPECT_TRUE(process()->is_connected()); 195 EXPECT_TRUE(process()->is_connected());
194 chrome::VersionInfo version_info; 196 chrome::VersionInfo version_info;
195 ForceServiceProcessShutdown(version_info.Version()); 197 ForceServiceProcessShutdown(version_info.Version());
196 WaitForShutdown(); 198 WaitForShutdown();
197 } 199 }
198 200
199 IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest, CheckPid) { 201 IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest, CheckPid) {
200 EXPECT_EQ(0, GetServiceProcessPid()); 202 EXPECT_EQ(0, GetServiceProcessPid());
201 // Launch the service process. 203 // Launch the service process.
202 LaunchServiceProcessControl(); 204 LaunchServiceProcessControl();
203 EXPECT_NE(static_cast<base::ProcessId>(0), GetServiceProcessPid()); 205 EXPECT_NE(static_cast<base::ProcessId>(0), GetServiceProcessPid());
204 } 206 }
205 207
206 #endif 208 #endif
207 209
208 DISABLE_RUNNABLE_METHOD_REFCOUNT(ServiceProcessControlBrowserTest); 210 DISABLE_RUNNABLE_METHOD_REFCOUNT(ServiceProcessControlBrowserTest);
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698