chrome/test/interactive_ui/fast_shutdown_interactive_uitest.cc - Issue 6685099: Removing command_execution_timeout_ms in favor of action_max_timeout_ms.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/test/interactive_ui/fast_shutdown_interactive_uitest.cc

Issue 6685099: Removing command_execution_timeout_ms in favor of action_max_timeout_ms. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 9 years, 8 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 | « chrome/test/functional/test_utils.py ('k') | chrome/test/pyautolib/pyauto.py » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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/file_path.h"	5 #include "base/file_path.h"

	6 #include "base/test/test_timeouts.h"

6 #include "chrome/app/chrome_command_ids.h"	7 #include "chrome/app/chrome_command_ids.h"

7 #include "chrome/browser/ui/view_ids.h"	8 #include "chrome/browser/ui/view_ids.h"

8 #include "chrome/test/automation/automation_proxy.h"	9 #include "chrome/test/automation/automation_proxy.h"

9 #include "chrome/test/automation/browser_proxy.h"	10 #include "chrome/test/automation/browser_proxy.h"

10 #include "chrome/test/automation/tab_proxy.h"	11 #include "chrome/test/automation/tab_proxy.h"

11 #include "chrome/test/automation/window_proxy.h"	12 #include "chrome/test/automation/window_proxy.h"

12 #include "chrome/test/ui/ui_test.h"	13 #include "chrome/test/ui/ui_test.h"

13 #include "chrome/test/ui_test_utils.h"	14 #include "chrome/test/ui_test_utils.h"

14 #include "ui/base/events.h"	15 #include "ui/base/events.h"

15 #include "ui/base/message_box_flags.h"	16 #include "ui/base/message_box_flags.h"

(...skipping 37 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
53 ASSERT_TRUE(browser->ApplyAccelerator(IDC_CLOSE_WINDOW));	54 ASSERT_TRUE(browser->ApplyAccelerator(IDC_CLOSE_WINDOW));

54 ASSERT_TRUE(automation()->WaitForAppModalDialog());	55 ASSERT_TRUE(automation()->WaitForAppModalDialog());

55 ASSERT_TRUE(automation()->ClickAppModalDialogButton(	56 ASSERT_TRUE(automation()->ClickAppModalDialogButton(

56 ui::MessageBoxFlags::DIALOGBUTTON_OK));	57 ui::MessageBoxFlags::DIALOGBUTTON_OK));

57	58

58 int exit_code = -1;	59 int exit_code = -1;

59 ASSERT_TRUE(launcher_->WaitForBrowserProcessToQuit(	60 ASSERT_TRUE(launcher_->WaitForBrowserProcessToQuit(

60 TestTimeouts::wait_for_terminate_timeout_ms(), &exit_code));	61 TestTimeouts::wait_for_terminate_timeout_ms(), &exit_code));

61 EXPECT_EQ(0, exit_code); // Expect a clean shutdown.	62 EXPECT_EQ(0, exit_code); // Expect a clean shutdown.

62 }	63 }

OLD	NEW