diff options
| author | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-19 18:47:48 +0000 |
|---|---|---|
| committer | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-19 18:47:48 +0000 |
| commit | e7d6293bf36c2e3c23c5789530ccfb4b99332daa (patch) | |
| tree | 52f2d8bb629faf44a14364d881800bb67d8409bc /rlz/lib/machine_id.cc | |
| parent | 737087635548b4632b2959198ecabd8969a6d054 (diff) | |
| download | chromium_src-e7d6293bf36c2e3c23c5789530ccfb4b99332daa.zip chromium_src-e7d6293bf36c2e3c23c5789530ccfb4b99332daa.tar.gz chromium_src-e7d6293bf36c2e3c23c5789530ccfb4b99332daa.tar.bz2 | |
Add base:: to string16 in rlz/.
R=rogerta@chromium.org
BUG=329295
Review URL: https://codereview.chromium.org/102833007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241896 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'rlz/lib/machine_id.cc')
| -rw-r--r-- | rlz/lib/machine_id.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rlz/lib/machine_id.cc b/rlz/lib/machine_id.cc index b8c10f0..1919d02 100644 --- a/rlz/lib/machine_id.cc +++ b/rlz/lib/machine_id.cc @@ -22,7 +22,7 @@ bool GetMachineId(std::string* machine_id) { return true; } - string16 sid_string; + base::string16 sid_string; int volume_id; if (!GetRawMachineId(&sid_string, &volume_id)) return false; @@ -37,7 +37,7 @@ bool GetMachineId(std::string* machine_id) { namespace testing { -bool GetMachineIdImpl(const string16& sid_string, +bool GetMachineIdImpl(const base::string16& sid_string, int volume_id, std::string* machine_id) { machine_id->clear(); @@ -52,7 +52,7 @@ bool GetMachineIdImpl(const string16& sid_string, // However, the chromebase SHA1 hash function takes only an std::string as // input, so the unicode string needs to be converted to std::string // "as is". - size_t byte_count = sid_string.size() * sizeof(string16::value_type); + size_t byte_count = sid_string.size() * sizeof(base::string16::value_type); const char* buffer = reinterpret_cast<const char*>(sid_string.c_str()); std::string sid_string_buffer(buffer, byte_count); |