summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sanity_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/browser/sanity_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/browser/sanity_uitest.cc')
-rw-r--r--chrome/browser/sanity_uitest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/sanity_uitest.cc b/chrome/browser/sanity_uitest.cc
index cecbd71..cd02db2 100644
--- a/chrome/browser/sanity_uitest.cc
+++ b/chrome/browser/sanity_uitest.cc
@@ -17,7 +17,7 @@ class GoogleTest : public UITest {
GoogleTest() : UITest() {
FilePath test_file =
test_data_directory_.AppendASCII("google").AppendASCII("google.html");
- homepage_ = GURL(net::FilePathToFileURL(test_file)).spec();
+ set_homepage(GURL(net::FilePathToFileURL(test_file)).spec());
}
};
@@ -34,7 +34,7 @@ class ColumnLayout : public UITest {
protected:
ColumnLayout() : UITest() {
FilePath test_file = test_data_directory_.AppendASCII("columns.html");
- homepage_ = GURL(net::FilePathToFileURL(test_file)).spec();
+ set_homepage(GURL(net::FilePathToFileURL(test_file)).spec());
}
};