Move more uses of string16 to specify base::
This makes base, ui, and net compile without the "using base::string16" directive that's currently checked in.
BUG=
Review URL: https://codereview.chromium.org/100303003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238246 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/base/pickle.h b/base/pickle.h
index 3254837..dd34f54 100644
--- a/base/pickle.h
+++ b/base/pickle.h
@@ -37,7 +37,7 @@
bool ReadFloat(float* result) WARN_UNUSED_RESULT;
bool ReadString(std::string* result) WARN_UNUSED_RESULT;
bool ReadWString(std::wstring* result) WARN_UNUSED_RESULT;
- bool ReadString16(string16* result) WARN_UNUSED_RESULT;
+ bool ReadString16(base::string16* result) WARN_UNUSED_RESULT;
bool ReadData(const char** data, int* length) WARN_UNUSED_RESULT;
bool ReadBytes(const char** data, int length) WARN_UNUSED_RESULT;
@@ -179,7 +179,7 @@
return iter->ReadWString(result);
}
bool ReadString16(PickleIterator* iter,
- string16* result) const WARN_UNUSED_RESULT {
+ base::string16* result) const WARN_UNUSED_RESULT {
return iter->ReadString16(result);
}
// A pointer to the data will be placed in *data, and the length will be
@@ -243,7 +243,7 @@
}
bool WriteString(const std::string& value);
bool WriteWString(const std::wstring& value);
- bool WriteString16(const string16& value);
+ bool WriteString16(const base::string16& value);
// "Data" is a blob with a length. When you read it out you will be given the
// length. See also WriteBytes.
bool WriteData(const char* data, int length);
