diff options
author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-14 23:15:47 +0000 |
---|---|---|
committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-14 23:15:47 +0000 |
commit | 3753f52d42975eaefcafca9fc0257ec24e161a9c (patch) | |
tree | c9622baf613dd1b47c304d30e1ded74fa84fce54 /chrome/browser/sessions/session_restore_uitest.cc | |
parent | 9e23bb1bba29dad5305e8f8a08341aefe7275502 (diff) | |
download | chromium_src-3753f52d42975eaefcafca9fc0257ec24e161a9c.zip chromium_src-3753f52d42975eaefcafca9fc0257ec24e161a9c.tar.gz chromium_src-3753f52d42975eaefcafca9fc0257ec24e161a9c.tar.bz2 |
Implement chrome_proces_util for linux and enable download ui test.
To get the PID from the socket, we use lsof (fuser doesn't work with unix sockets apparently).
The download shelf, save page, and browser ui tests now pass.
Review URL: http://codereview.chromium.org/66071
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13716 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sessions/session_restore_uitest.cc')
-rw-r--r-- | chrome/browser/sessions/session_restore_uitest.cc | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/chrome/browser/sessions/session_restore_uitest.cc b/chrome/browser/sessions/session_restore_uitest.cc index 4c4538f..0b7315a 100644 --- a/chrome/browser/sessions/session_restore_uitest.cc +++ b/chrome/browser/sessions/session_restore_uitest.cc @@ -22,16 +22,12 @@ namespace { class SessionRestoreUITest : public UITest { protected: SessionRestoreUITest() : UITest() { - FilePath path_prefix = FilePath::FromWStringHack(test_data_directory_); - path_prefix = path_prefix.AppendASCII("session_history") - .Append(FilePath::StringType(&FilePath::kSeparators[0], 1)); - - url1 = net::FilePathToFileURL( - path_prefix.AppendASCII("bot1.html")); - url2 = net::FilePathToFileURL( - path_prefix.AppendASCII("bot2.html")); - url3 = net::FilePathToFileURL( - path_prefix.AppendASCII("bot3.html")); + FilePath path_prefix = FilePath::FromWStringHack(test_data_directory_) + .AppendASCII("session_history"); + + url1 = net::FilePathToFileURL(path_prefix.AppendASCII("bot1.html")); + url2 = net::FilePathToFileURL(path_prefix.AppendASCII("bot2.html")); + url3 = net::FilePathToFileURL(path_prefix.AppendASCII("bot3.html")); } virtual void QuitBrowserAndRestore(int expected_tab_count) { @@ -86,7 +82,7 @@ class SessionRestoreUITest : public UITest { GURL url3; private: - DISALLOW_EVIL_CONSTRUCTORS(SessionRestoreUITest); + DISALLOW_COPY_AND_ASSIGN(SessionRestoreUITest); }; } // namespace |