| Index: content/browser/web_contents/web_drag_source_mac.mm
|
| diff --git a/content/browser/web_contents/web_drag_source_mac.mm b/content/browser/web_contents/web_drag_source_mac.mm
|
| index c66732050c9d386c4c1f1606096c3b8babfdeff9..a5b51b07d6a1dfff29b43ffe4ec1ced3dcff7d88 100644
|
| --- a/content/browser/web_contents/web_drag_source_mac.mm
|
| +++ b/content/browser/web_contents/web_drag_source_mac.mm
|
| @@ -147,7 +147,7 @@ void PromiseWriterHelper(const DropData& drop_data,
|
| - (void)lazyWriteToPasteboard:(NSPasteboard*)pboard forType:(NSString*)type {
|
| // NSHTMLPboardType requires the character set to be declared. Otherwise, it
|
| // assumes US-ASCII. Awesome.
|
| - const base::string16 kHtmlHeader = ASCIIToUTF16(
|
| + const base::string16 kHtmlHeader = base::ASCIIToUTF16(
|
| "<meta http-equiv=\"Content-Type\" content=\"text/html;charset=UTF-8\">");
|
|
|
| // Be extra paranoid; avoid crashing.
|
| @@ -397,7 +397,7 @@ void PromiseWriterHelper(const DropData& drop_data,
|
| // name.
|
| std::string defaultName =
|
| content::GetContentClient()->browser()->GetDefaultDownloadName();
|
| - mimeType = UTF16ToUTF8(mimeType16);
|
| + mimeType = base::UTF16ToUTF8(mimeType16);
|
| downloadFileName_ =
|
| net::GenerateFileName(downloadURL_,
|
| std::string(),
|
|
|