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

Side by Side Diff: chrome/browser/ui/test/browser_dialog_browsertest.cc

Issue 2660553005: Harmony - convert hung renderer dialog. (Closed)
Patch Set: remove test friends Created 3 years, 10 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/command_line.h" 5 #include "base/command_line.h"
6 #include "base/process/launch.h" 6 #include "base/process/launch.h"
7 #include "base/test/launcher/test_launcher.h" 7 #include "base/test/launcher/test_launcher.h"
8 #include "base/test/test_switches.h" 8 #include "base/test/test_switches.h"
9 #include "base/test/test_timeouts.h" 9 #include "base/test/test_timeouts.h"
10 #include "chrome/browser/ui/test/test_browser_dialog.h" 10 #include "chrome/browser/ui/test/test_browser_dialog.h"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 59
60 base::LaunchOptions options; 60 base::LaunchOptions options;
61 61
62 // Disable timeouts and generate screen output if --interactive was specified. 62 // Disable timeouts and generate screen output if --interactive was specified.
63 if (command.HasSwitch(internal::kInteractiveSwitch)) { 63 if (command.HasSwitch(internal::kInteractiveSwitch)) {
64 command.AppendSwitchASCII(switches::kUiTestActionMaxTimeout, 64 command.AppendSwitchASCII(switches::kUiTestActionMaxTimeout,
65 TestTimeouts::kNoTimeoutSwitchValue); 65 TestTimeouts::kNoTimeoutSwitchValue);
66 command.AppendSwitchASCII(switches::kTestLauncherTimeout, 66 command.AppendSwitchASCII(switches::kTestLauncherTimeout,
67 TestTimeouts::kNoTimeoutSwitchValue); 67 TestTimeouts::kNoTimeoutSwitchValue);
68 command.AppendSwitch(switches::kEnablePixelOutputInTests); 68 command.AppendSwitch(switches::kEnablePixelOutputInTests);
69 #if defined(OS_WIN)
70 options.wait = true;
Bret 2017/02/01 00:05:30 This is the fix for having to pass in --single-pro
tapted 2017/02/01 00:52:48 Can you comment here? I don't know too much about
Bret 2017/02/01 02:21:46 I actually don't know why this is necessary either
Peter Kasting 2017/02/02 00:32:30 I don't know either, but it would be good to find
Bret 2017/02/03 01:47:17 This is way outside of my wheelhouse, so I'd rathe
71 #endif
69 } else { 72 } else {
70 options.wait = true; 73 options.wait = true;
71 } 74 }
72 75
73 base::LaunchProcess(command, options); 76 base::LaunchProcess(command, options);
74 } 77 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698