Replace string16 with base::string16 in src/webkit

webkit/appcache/manifest_parser.cc

Index: webkit/appcache/manifest_parser.cc
diff --git a/webkit/appcache/manifest_parser.cc b/webkit/appcache/manifest_parser.cc
index eb16d8b80a0792d739a39370663322b5d9346f79..0d98d1e5758c357dcc7ee2b28e626fc88e345dc2 100644
--- a/webkit/appcache/manifest_parser.cc
+++ b/webkit/appcache/manifest_parser.cc
@@ -57,7 +57,7 @@ bool ParseManifest(const GURL& manifest_url, const char* data, int length,
   //   http://www.w3.org/TR/html5/offline.html
   // Do not modify it without consulting those docs.
   // Though you might be tempted to convert these wstrings to UTF-8 or
-  // string16, this implementation seems simpler given the constraints.
+  // base::string16, this implementation seems simpler given the constraints.
 
   const wchar_t kSignature[] = L"CACHE MANIFEST";
   const size_t kSignatureLength = arraysize(kSignature) - 1;
@@ -162,7 +162,7 @@ bool ParseManifest(const GURL& manifest_url, const char* data, int length,
       while (line_p < line_end && *line_p != '\t' && *line_p != ' ')
         ++line_p;
 
-      string16 url16;
+      base::string16 url16;
       WideToUTF16(line.c_str(), line_p - line.c_str(), &url16);
       GURL url = manifest_url.Resolve(url16);
       if (!url.is_valid())
@@ -205,7 +205,7 @@ bool ParseManifest(const GURL& manifest_url, const char* data, int length,
       if (line_p == line_end)
         continue;  // There was no whitespace separating the URLs.
 
-      string16 namespace_url16;
+      base::string16 namespace_url16;
       WideToUTF16(line.c_str(), line_p - line.c_str(), &namespace_url16);
       GURL namespace_url = manifest_url.Resolve(namespace_url16);
       if (!namespace_url.is_valid())
@@ -244,7 +244,7 @@ bool ParseManifest(const GURL& manifest_url, const char* data, int length,
       while (line_p < line_end && *line_p != '\t' && *line_p != ' ')
         ++line_p;
 
-      string16 target_url16;
+      base::string16 target_url16;
       WideToUTF16(target_url_start, line_p - target_url_start, &target_url16);
       GURL target_url = manifest_url.Resolve(target_url16);
       if (!target_url.is_valid())
@@ -273,7 +273,7 @@ bool ParseManifest(const GURL& manifest_url, const char* data, int length,
         continue;
       }
 
-      string16 namespace_url16;
+      base::string16 namespace_url16;
       WideToUTF16(line.c_str(), line_p - line.c_str(), &namespace_url16);
       GURL namespace_url = manifest_url.Resolve(namespace_url16);
       if (!namespace_url.is_valid())
@@ -299,7 +299,7 @@ bool ParseManifest(const GURL& manifest_url, const char* data, int length,
       while (line_p < line_end && *line_p != '\t' && *line_p != ' ')
         ++line_p;
 
-      string16 fallback_url16;
+      base::string16 fallback_url16;
       WideToUTF16(fallback_start, line_p - fallback_start, &fallback_url16);
       GURL fallback_url = manifest_url.Resolve(fallback_url16);
       if (!fallback_url.is_valid())