summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorlzheng@chromium.org <lzheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-25 19:05:44 +0000
committerlzheng@chromium.org <lzheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-25 19:05:44 +0000
commit1020e1497fac6174ae7445d9878162751cec6af2 (patch)
tree6a174781666adf2df4432b497e7c4ce7b3d22f84 /chrome
parentd64217b4348e1422ac2c60f8c7777e3278b12b1f (diff)
downloadchromium_src-1020e1497fac6174ae7445d9878162751cec6af2.zip
chromium_src-1020e1497fac6174ae7445d9878162751cec6af2.tar.gz
chromium_src-1020e1497fac6174ae7445d9878162751cec6af2.tar.bz2
Disable forceshutdown.
TEST=none BUG=70793 Review URL: http://codereview.chromium.org/6293019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72520 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/service/service_process_control_browsertest.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/service/service_process_control_browsertest.cc b/chrome/browser/service/service_process_control_browsertest.cc
index 8a4cc3c..afe4594 100644
--- a/chrome/browser/service/service_process_control_browsertest.cc
+++ b/chrome/browser/service/service_process_control_browsertest.cc
@@ -186,7 +186,9 @@ IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest, DieOnDisconnect) {
WaitForShutdown();
}
-IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest, ForceShutdown) {
+//http://code.google.com/p/chromium/issues/detail?id=70793
+IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest,
+ DISABLED_ForceShutdown) {
// Launch the service process.
LaunchServiceProcessControl();
// Make sure we are connected to the service process.