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

Unified Diff: webkit/browser/appcache/manifest_parser.cc

Issue 121123002: Update uses of UTF conversions in ppapi/, printing/, remoting/, rlz/, sandbox/, skia/, sql/, sync/,… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 | « tools/memory_watcher/memory_watcher.cc ('k') | webkit/browser/appcache/view_appcache_internals_job.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/browser/appcache/manifest_parser.cc
diff --git a/webkit/browser/appcache/manifest_parser.cc b/webkit/browser/appcache/manifest_parser.cc
index be44127631bd01ce1501fb55bb5397dc792f2bca..5735fe4b6bc874279b7e8f4a4b41f375a19c126b 100644
--- a/webkit/browser/appcache/manifest_parser.cc
+++ b/webkit/browser/appcache/manifest_parser.cc
@@ -187,7 +187,7 @@ bool ParseManifest(const GURL& manifest_url, const char* data, int length,
++line_p;
base::string16 url16;
- WideToUTF16(line.c_str(), line_p - line.c_str(), &url16);
+ base::WideToUTF16(line.c_str(), line_p - line.c_str(), &url16);
GURL url = manifest_url.Resolve(url16);
if (!url.is_valid())
continue;
@@ -232,7 +232,7 @@ bool ParseManifest(const GURL& manifest_url, const char* data, int length,
continue; // There was no whitespace separating the URLs.
base::string16 namespace_url16;
- WideToUTF16(line.c_str(), line_p - line.c_str(), &namespace_url16);
+ base::WideToUTF16(line.c_str(), line_p - line.c_str(), &namespace_url16);
GURL namespace_url = manifest_url.Resolve(namespace_url16);
if (!namespace_url.is_valid())
continue;
@@ -279,7 +279,8 @@ bool ParseManifest(const GURL& manifest_url, const char* data, int length,
++line_p;
base::string16 target_url16;
- WideToUTF16(target_url_start, line_p - target_url_start, &target_url16);
+ base::WideToUTF16(target_url_start, line_p - target_url_start,
+ &target_url16);
GURL target_url = manifest_url.Resolve(target_url16);
if (!target_url.is_valid())
continue;
@@ -310,7 +311,7 @@ bool ParseManifest(const GURL& manifest_url, const char* data, int length,
}
base::string16 namespace_url16;
- WideToUTF16(line.c_str(), line_p - line.c_str(), &namespace_url16);
+ base::WideToUTF16(line.c_str(), line_p - line.c_str(), &namespace_url16);
GURL namespace_url = manifest_url.Resolve(namespace_url16);
if (!namespace_url.is_valid())
continue;
@@ -336,7 +337,8 @@ bool ParseManifest(const GURL& manifest_url, const char* data, int length,
++line_p;
base::string16 fallback_url16;
- WideToUTF16(fallback_start, line_p - fallback_start, &fallback_url16);
+ base::WideToUTF16(fallback_start, line_p - fallback_start,
+ &fallback_url16);
GURL fallback_url = manifest_url.Resolve(fallback_url16);
if (!fallback_url.is_valid())
continue;
« no previous file with comments | « tools/memory_watcher/memory_watcher.cc ('k') | webkit/browser/appcache/view_appcache_internals_job.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698