Convert string16 to base::string16 in content.

content/browser/download/drag_download_util.cc

 // Copyright (c) 2012 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.
 
 #include "content/browser/download/drag_download_util.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/file_stream.h"
 #include "net/base/net_errors.h"
 #include "url/gurl.h"
 
 using net::FileStream;
 
 namespace content {
 
-bool ParseDownloadMetadata(const string16& metadata,
-                           string16* mime_type,
+bool ParseDownloadMetadata(const base::string16& metadata,
+                           base::string16* mime_type,
                            base::FilePath* file_name,
                            GURL* url) {
   const char16 separator = L':';
 
   size_t mime_type_end_pos = metadata.find(separator);
-  if (mime_type_end_pos == string16::npos)
+  if (mime_type_end_pos == base::string16::npos)
     return false;
 
   size_t file_name_end_pos = metadata.find(separator, mime_type_end_pos + 1);
-  if (file_name_end_pos == string16::npos)
+  if (file_name_end_pos == base::string16::npos)
     return false;
 
   GURL parsed_url = GURL(metadata.substr(file_name_end_pos + 1));
   if (!parsed_url.is_valid())
     return false;
 
   if (mime_type)
     *mime_type = metadata.substr(0, mime_type_end_pos);
   if (file_name) {
-    string16 file_name_str = metadata.substr(
+    base::string16 file_name_str = metadata.substr(
         mime_type_end_pos + 1, file_name_end_pos - mime_type_end_pos  - 1);
 #if defined(OS_WIN)
     *file_name = base::FilePath(file_name_str);
 #else
     *file_name = base::FilePath(UTF16ToUTF8(file_name_str));
 #endif
   }
   if (url)
     *url = parsed_url;
 
   return true;
 }
 
 FileStream* CreateFileStreamForDrop(base::FilePath* file_path,
                                     net::NetLog* net_log) {
   DCHECK(file_path && !file_path->empty());
 
   scoped_ptr<FileStream> file_stream(new FileStream(net_log));
   const int kMaxSeq = 99;
   for (int seq = 0; seq <= kMaxSeq; seq++) {
     base::FilePath new_file_path;
     if (seq == 0) {
       new_file_path = *file_path;
     } else {
 #if defined(OS_WIN)
-      string16 suffix = ASCIIToUTF16("-") + base::IntToString16(seq);
+      base::string16 suffix = ASCIIToUTF16("-") + base::IntToString16(seq);
 #else
       std::string suffix = std::string("-") + base::IntToString(seq);
 #endif
       new_file_path = file_path->InsertBeforeExtension(suffix);
     }
 
     // http://crbug.com/110709
     base::ThreadRestrictions::ScopedAllowIO allow_io;
 
     // Explicitly (and redundantly check) for file -- despite the fact that our
@@ skipping 28 matching lines @@
 }
 
 PromiseFileFinalizer::~PromiseFileFinalizer() {}
 
 void PromiseFileFinalizer::Cleanup() {
   if (drag_file_downloader_.get())
     drag_file_downloader_ = NULL;
 }
 
 }  // namespace content