summaryrefslogtreecommitdiffstats
path: root/rlz/win
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-25 19:37:03 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-25 19:37:03 +0000
commit6c3bf032651d5f912775e0c8cd7e962454145ced (patch)
tree88cf8b652147b9acf47aa81999f8652609890dde /rlz/win
parentce51317df2e23a717f95e56e1a9db1a7fb330a16 (diff)
downloadchromium_src-6c3bf032651d5f912775e0c8cd7e962454145ced.zip
chromium_src-6c3bf032651d5f912775e0c8cd7e962454145ced.tar.gz
chromium_src-6c3bf032651d5f912775e0c8cd7e962454145ced.tar.bz2
Update uses of UTF conversions in ppapi/, printing/, remoting/, rlz/, sandbox/, skia/, sql/, sync/, tools/, webkit/, win8/ to use the base:: namespace.
BUG=330556 TEST=no change TBR=ben@chromium.org Review URL: https://codereview.chromium.org/121123002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242502 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'rlz/win')
-rw-r--r--rlz/win/lib/registry_util.cc4
-rw-r--r--rlz/win/lib/rlz_value_store_registry.cc2
2 files changed, 4 insertions, 2 deletions
diff --git a/rlz/win/lib/registry_util.cc b/rlz/win/lib/registry_util.cc
index cb4a686..e5b7298 100644
--- a/rlz/win/lib/registry_util.cc
+++ b/rlz/win/lib/registry_util.cc
@@ -31,14 +31,14 @@ bool RegKeyReadValue(base::win::RegKey& key, const wchar_t* name,
}
// Note that RLZ string are always ASCII by design.
- strncpy(value, WideToUTF8(value_string).c_str(), *value_size);
+ strncpy(value, base::WideToUTF8(value_string).c_str(), *value_size);
value[*value_size - 1] = 0;
return true;
}
bool RegKeyWriteValue(base::win::RegKey& key, const wchar_t* name,
const char* value) {
- std::wstring value_string(ASCIIToWide(value));
+ std::wstring value_string(base::ASCIIToWide(value));
return key.WriteValue(name, value_string.c_str()) == ERROR_SUCCESS;
}
diff --git a/rlz/win/lib/rlz_value_store_registry.cc b/rlz/win/lib/rlz_value_store_registry.cc
index 0aa0023..2b50767 100644
--- a/rlz/win/lib/rlz_value_store_registry.cc
+++ b/rlz/win/lib/rlz_value_store_registry.cc
@@ -13,6 +13,8 @@
#include "rlz/lib/string_utils.h"
#include "rlz/win/lib/registry_util.h"
+using base::ASCIIToWide;
+
namespace rlz_lib {
namespace {