summaryrefslogtreecommitdiffstats
path: root/chrome/common/logging_chrome_uitest.cc
diff options
context:
space:
mode:
authornirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-08 02:04:59 +0000
committernirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-08 02:04:59 +0000
commitc405290f60432b22e8e862377b4f00e6177b4451 (patch)
treea710eb4876a4ea9013715ba90a27139d5da835bc /chrome/common/logging_chrome_uitest.cc
parent079443435c92b0294d63682c39a26df3391018c4 (diff)
downloadchromium_src-c405290f60432b22e8e862377b4f00e6177b4451.zip
chromium_src-c405290f60432b22e8e862377b4f00e6177b4451.tar.gz
chromium_src-c405290f60432b22e8e862377b4f00e6177b4451.tar.bz2
Moves everything related to launching and terminating the browser from UITestBase into ProxyLauncher.
The primary changes are in ui_test.* and proxy_launcher.*. The changes in the remaining files are mostly just changing namespaces from UITestBase:: to ProxyLauncher::. BUG=None. TEST=All tests should pass. No functionality change. Review URL: http://codereview.chromium.org/5967003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70827 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/logging_chrome_uitest.cc')
-rw-r--r--chrome/common/logging_chrome_uitest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/common/logging_chrome_uitest.cc b/chrome/common/logging_chrome_uitest.cc
index 96e3205..5d4236a 100644
--- a/chrome/common/logging_chrome_uitest.cc
+++ b/chrome/common/logging_chrome_uitest.cc
@@ -98,7 +98,7 @@ class AssertionTest : public UITest {
#define Assertion DISABLED_Assertion
#endif
TEST_F(AssertionTest, Assertion) {
- if (UITest::in_process_renderer()) {
+ if (ProxyLauncher::in_process_renderer()) {
// in process mode doesn't do the crashing.
expected_errors_ = 0;
expected_crashes_ = 0;
@@ -133,7 +133,7 @@ class CheckFalseTest : public UITest {
#endif
// Launch the app in assertion test mode, then close the app.
TEST_F(CheckFalseTest, CheckFails) {
- if (UITest::in_process_renderer()) {
+ if (ProxyLauncher::in_process_renderer()) {
// in process mode doesn't do the crashing.
expected_errors_ = 0;
expected_crashes_ = 0;
@@ -171,7 +171,7 @@ class RendererCrashTest : public UITest {
#endif
// Launch the app in renderer crash test mode, then close the app.
TEST_F(RendererCrashTest, Crash) {
- if (UITest::in_process_renderer()) {
+ if (ProxyLauncher::in_process_renderer()) {
// in process mode doesn't do the crashing.
expected_crashes_ = 0;
} else {