chrome/test/interactive_ui/fast_shutdown_interactive_uitest.cc - Issue 5967003: Refactor UITestBase/ProxyLauncher.

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 5967003: Refactor UITestBase/ProxyLauncher. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Add POD struct to hold some launcher variables. 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

« chrome/test/automation/proxy_launcher.h ('K') | « chrome/test/automation/proxy_launcher.cc ('k') | chrome/test/interactive_ui/npapi_interactive_test.cc » ('j') | no next file with comments »

OLD	NEW
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 "app/message_box_flags.h"	5 #include "app/message_box_flags.h"

6 #include "base/file_path.h"	6 #include "base/file_path.h"

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

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

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

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

(...skipping 36 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
47 // Close the tab, removing the one and only before unload handler.	47 // Close the tab, removing the one and only before unload handler.

48 scoped_refptr<TabProxy> tab(browser->GetTab(1));	48 scoped_refptr<TabProxy> tab(browser->GetTab(1));

49 ASSERT_TRUE(tab->Close(true));	49 ASSERT_TRUE(tab->Close(true));

50	50

51 // Close the browser. We should launch the unload handler, which is an	51 // Close the browser. We should launch the unload handler, which is an

52 // alert().	52 // alert().

53 ASSERT_TRUE(browser->ApplyAccelerator(IDC_CLOSE_WINDOW));	53 ASSERT_TRUE(browser->ApplyAccelerator(IDC_CLOSE_WINDOW));

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

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

56 MessageBoxFlags::DIALOGBUTTON_OK));	56 MessageBoxFlags::DIALOGBUTTON_OK));

57 ASSERT_TRUE(WaitForBrowserProcessToQuit());	57 ASSERT_TRUE(WaitForBrowserProcessToQuit(

	58 TestTimeouts::wait_for_terminate_timeout_ms()));

58 }	59 }

OLD	NEW