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.h | |
| 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.h')
| -rw-r--r-- | rlz/lib/machine_id.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rlz/lib/machine_id.h b/rlz/lib/machine_id.h index af58c8e..312f669 100644 --- a/rlz/lib/machine_id.h +++ b/rlz/lib/machine_id.h @@ -21,10 +21,10 @@ bool GetMachineId(std::string* machine_id); // Retrieves a raw machine identifier string and a machine-specific // 4 byte value. GetMachineId() will SHA1 |data|, append |more_data|, compute // the Crc8 of that, and return a hex-encoded string of that data. -bool GetRawMachineId(string16* data, int* more_data); +bool GetRawMachineId(base::string16* data, int* more_data); namespace testing { -bool GetMachineIdImpl(const string16& sid_string, +bool GetMachineIdImpl(const base::string16& sid_string, int volume_id, std::string* machine_id); } // namespace testing |