Update uses of UTF conversions in ppapi/, printing/, remoting/, rlz/, sandbox/, skia/, sql/, sync/,…

webkit/browser/appcache/manifest_parser.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // This is a port of ManifestParser.cc from WebKit/WebCore/loader/appcache.
 
 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ skipping 169 matching lines @@
       continue;
     } else if (mode == EXPLICIT || mode == ONLINE_WHITELIST) {
       const wchar_t *line_p = line.c_str();
       const wchar_t *line_end = line_p + line.length();
 
       // Look for whitespace separating the URL from subsequent ignored tokens.
       while (line_p < line_end && *line_p != '\t' && *line_p != ' ')
         ++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;
       if (url.has_ref()) {
         GURL::Replacements replacements;
         replacements.ClearRef();
         url = url.ReplaceComponents(replacements);
       }
 
       // Scheme component must be the same as the manifest URL's.
@@ skipping 24 matching lines @@
 
       // Look for first whitespace separating the url namespace from
       // the intercept type.
       while (line_p < line_end && *line_p != '\t' && *line_p != ' ')
         ++line_p;
 
       if (line_p == line_end)
         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;
       if (namespace_url.has_ref()) {
         GURL::Replacements replacements;
         replacements.ClearRef();
         namespace_url = namespace_url.ReplaceComponents(replacements);
       }
 
       // The namespace URL must have the same scheme, host and port
@@ skipping 26 matching lines @@
       // Skip whitespace separating type from the target_url.
       while (line_p < line_end && (*line_p == '\t' || *line_p == ' '))
         ++line_p;
 
       // Look for whitespace separating the URL from subsequent ignored tokens.
       const wchar_t* target_url_start = line_p;
       while (line_p < line_end && *line_p != '\t' && *line_p != ' ')
         ++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;
 
       if (target_url.has_ref()) {
         GURL::Replacements replacements;
         replacements.ClearRef();
         target_url = target_url.ReplaceComponents(replacements);
       }
       if (manifest_url.GetOrigin() != target_url.GetOrigin())
@@ skipping 10 matching lines @@
       // Look for whitespace separating the two URLs
       while (line_p < line_end && *line_p != '\t' && *line_p != ' ')
         ++line_p;
 
       if (line_p == line_end) {
         // There was no whitespace separating the URLs.
         continue;
       }
 
       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;
       if (namespace_url.has_ref()) {
         GURL::Replacements replacements;
         replacements.ClearRef();
         namespace_url = namespace_url.ReplaceComponents(replacements);
       }
 
       // Fallback namespace URL must have the same scheme, host and port
       // as the manifest's URL.
       if (manifest_url.GetOrigin() != namespace_url.GetOrigin()) {
         continue;
       }
 
       // Skip whitespace separating fallback namespace from URL.
       while (line_p < line_end && (*line_p == '\t' || *line_p == ' '))
         ++line_p;
 
       // Look for whitespace separating the URL from subsequent ignored tokens.
       const wchar_t* fallback_start = line_p;
       while (line_p < line_end && *line_p != '\t' && *line_p != ' ')
         ++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;
       if (fallback_url.has_ref()) {
         GURL::Replacements replacements;
         replacements.ClearRef();
         fallback_url = fallback_url.ReplaceComponents(replacements);
       }
 
       // Fallback entry URL must have the same scheme, host and port
@@ skipping 11 matching lines @@
                     fallback_url, is_pattern));
     } else {
       NOTREACHED();
     }
   }
 
   return true;
 }
 
 }  // namespace appcache