diff options
| author | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-07 15:29:49 +0000 |
|---|---|---|
| committer | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-07 15:29:49 +0000 |
| commit | 6b27db809e959efaf7183ea2de64c6ab3947ef3d (patch) | |
| tree | ed2ed10f826f6eb40884231ee0c98d86afef44a7 /chrome/browser/firefox_importer_utils.cc | |
| parent | 65b1094478e054ef1f924d3681f8d34ec88d9fcf (diff) | |
| download | chromium_src-6b27db809e959efaf7183ea2de64c6ab3947ef3d.zip chromium_src-6b27db809e959efaf7183ea2de64c6ab3947ef3d.tar.gz chromium_src-6b27db809e959efaf7183ea2de64c6ab3947ef3d.tar.bz2 | |
Remove the old NativeMB functions from string util, and use the new ones in sys_strings.h. I also removed duplicated code from the sandbox that can now use this, and fixed one case in the bug reporter that should not have been using the native multibyte encoding.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@515 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/firefox_importer_utils.cc')
| -rw-r--r-- | chrome/browser/firefox_importer_utils.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/firefox_importer_utils.cc b/chrome/browser/firefox_importer_utils.cc index 96b6d8c..a7ab5ef 100644 --- a/chrome/browser/firefox_importer_utils.cc +++ b/chrome/browser/firefox_importer_utils.cc @@ -35,6 +35,7 @@ #include "base/logging.h" #include "base/registry.h" #include "base/string_util.h" +#include "base/sys_string_conversions.h" #include "base/time.h" #include "chrome/browser/template_url.h" #include "chrome/browser/template_url_model.h" @@ -507,7 +508,7 @@ bool NSSDecryptor::Init(const std::wstring& dll_path, return false; } - SECStatus result = NSS_Init(WideToNativeMB(db_path).c_str()); + SECStatus result = NSS_Init(base::SysWideToNativeMB(db_path).c_str()); if (result != SECSuccess) { Free(); return false; |