Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1381)

Unified Diff: chrome/test/ui/ui_test.cc

Issue 255036: Adding a SIGTERM handler for OS_POSIX builds. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/browser_uitest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/ui/ui_test.cc
===================================================================
--- chrome/test/ui/ui_test.cc (revision 27997)
+++ chrome/test/ui/ui_test.cc (working copy)
@@ -600,8 +600,6 @@
return GetRunningChromeProcesses(data_dir).size();
}
-#if defined(OS_WIN)
-// TODO(port): Port GetRunningChromeProcesses and sort out one w/string issue.
static DictionaryValue* LoadDictionaryValueFromPath(const FilePath& path) {
if (path.empty())
return NULL;
@@ -621,13 +619,12 @@
}
DictionaryValue* UITest::GetDefaultProfilePreferences() {
- std::wstring path;
- PathService::Get(chrome::DIR_USER_DATA, &path);
- file_util::AppendToPath(&path, chrome::kNotSignedInProfile);
- file_util::AppendToPath(&path, chrome::kPreferencesFilename);
- return LoadDictionaryValueFromPath(FilePath::FromWStringHack(path));
+ std::wstring path_wstring;
+ PathService::Get(chrome::DIR_USER_DATA, &path_wstring);
+ file_util::AppendToPath(&path_wstring, chrome::kNotSignedInProfile);
+ FilePath path(FilePath::FromWStringHack(path_wstring));
+ return LoadDictionaryValueFromPath(path.Append(chrome::kPreferencesFilename));
}
-#endif // OS_WIN
int UITest::GetTabCount() {
scoped_refptr<BrowserProxy> first_window(automation()->GetBrowserWindow(0));
« no previous file with comments | « chrome/browser/browser_uitest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698