diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-19 22:54:41 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-19 22:54:41 +0000 |
| commit | ab926d553d2fbab7f170826afa811a253a8a65c8 (patch) | |
| tree | 76c577b278544269f2ee04412b9661528d57856e /chrome/test/ui | |
| parent | 02e60209512e8013f962d33c0916613b796cad84 (diff) | |
| download | chromium_src-ab926d553d2fbab7f170826afa811a253a8a65c8.zip chromium_src-ab926d553d2fbab7f170826afa811a253a8a65c8.tar.gz chromium_src-ab926d553d2fbab7f170826afa811a253a8a65c8.tar.bz2 | |
Deprecate PathService::Get(..., wstring*) and use FilePath instead.
I tried fixing all the Windows code but there's a *ton* of it.
This change will at least prevent people from adding new code that
uses the deprecated version (as that won't compile on Lin/Mac).
BUG=24672
Review URL: http://codereview.chromium.org/293013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29472 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/ui')
| -rw-r--r-- | chrome/test/ui/ui_test.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc index cc53886..4f18195 100644 --- a/chrome/test/ui/ui_test.cc +++ b/chrome/test/ui/ui_test.cc @@ -644,10 +644,9 @@ DictionaryValue* UITest::GetLocalState() { } DictionaryValue* UITest::GetDefaultProfilePreferences() { - 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)); + FilePath path; + PathService::Get(chrome::DIR_USER_DATA, &path); + path = path.AppendASCII(WideToASCII(chrome::kNotSignedInProfile)); return LoadDictionaryValueFromPath(path.Append(chrome::kPreferencesFilename)); } |