Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5709)

Unified Diff: chrome/test/chromedriver/chrome/zip_reader.cc

Issue 94013004: Add base:: to string16s in chrome/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: try again Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/chromedriver/chrome/zip_internal.cc ('k') | chrome/test/chromedriver/key_converter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/chromedriver/chrome/zip_reader.cc
diff --git a/chrome/test/chromedriver/chrome/zip_reader.cc b/chrome/test/chromedriver/chrome/zip_reader.cc
index 218c8d7e77d57f0a297541b08d2f85695ae0b4e8..71d11f5fd85dad23eb3a8861c3e12ff57a78503e 100644
--- a/chrome/test/chromedriver/chrome/zip_reader.cc
+++ b/chrome/test/chromedriver/chrome/zip_reader.cc
@@ -39,7 +39,7 @@ ZipReader::EntryInfo::EntryInfo(const std::string& file_name_in_zip,
is_unsafe_ = file_name_in_zip.find("..") != std::string::npos;
// We also consider that the file name is unsafe, if it's invalid UTF-8.
- string16 file_name_utf16;
+ base::string16 file_name_utf16;
if (!UTF8ToUTF16(file_name_in_zip.data(), file_name_in_zip.size(),
&file_name_utf16)) {
is_unsafe_ = true;
« no previous file with comments | « chrome/test/chromedriver/chrome/zip_internal.cc ('k') | chrome/test/chromedriver/key_converter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698