Allow empty strings to be written to the clipboard

content/browser/web_contents/web_drag_source_mac.mm

 // 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.
 
 #import "content/browser/web_contents/web_drag_source_mac.h"
 
 #include <sys/param.h>
 
 #include "base/bind.h"
 #include "base/file_path.h"
@@ skipping 133 matching lines @@
       "<meta http-equiv=\"Content-Type\" content=\"text/html;charset=UTF-8\">");
 
   // Be extra paranoid; avoid crashing.
   if (!dropData_.get()) {
     NOTREACHED();
     return;
   }
 
   // HTML.
   if ([type isEqualToString:NSHTMLPboardType]) {
-    DCHECK(!dropData_->text_html.empty());
+    DCHECK(!dropData_->html.string().empty());
     // See comment on |kHtmlHeader| above.
-    [pboard setString:SysUTF16ToNSString(kHtmlHeader + dropData_->text_html)
+    [pboard setString:SysUTF16ToNSString(kHtmlHeader + dropData_->html.string())
               forType:NSHTMLPboardType];
 
   // URL.
   } else if ([type isEqualToString:NSURLPboardType]) {
     DCHECK(dropData_->url.is_valid());
     NSURL* url = [NSURL URLWithString:SysUTF8ToNSString(dropData_->url.spec())];
     // If NSURL creation failed, check for a badly-escaped JavaScript URL.
     // Strip out any existing escapes and then re-escape uniformly.
     if (!url && dropData_->url.SchemeIs(chrome::kJavaScriptScheme)) {
       net::UnescapeRule::Type unescapeRules =
@@ skipping 32 matching lines @@
     // our image into a TIFF. This is also suboptimal since this is all done
     // synchronously. I'm not sure there's much we can easily do about it.
     scoped_nsobject<NSImage> image(
         [[NSImage alloc] initWithData:[NSData
                 dataWithBytes:dropData_->file_contents.data()
                        length:dropData_->file_contents.length()]]);
     [pboard setData:[image TIFFRepresentation] forType:NSTIFFPboardType];
 
   // Plain text.
   } else if ([type isEqualToString:NSStringPboardType]) {
-    DCHECK(!dropData_->plain_text.empty());
-    [pboard setString:SysUTF16ToNSString(dropData_->plain_text)
+    DCHECK(!dropData_->text.string().empty());
+    [pboard setString:SysUTF16ToNSString(dropData_->text.string())
               forType:NSStringPboardType];
 
   // Custom MIME data.
   } else if ([type isEqualToString:ui::kWebCustomDataPboardType]) {
     Pickle pickle;
     ui::WriteCustomDataToPickle(dropData_->custom_data, &pickle);
     [pboard setData:[NSData dataWithBytes:pickle.data() length:pickle.size()]
             forType:ui::kWebCustomDataPboardType];
 
   // Oops!
@@ skipping 147 matching lines @@
 @implementation WebDragSource (Private)
 
 - (void)fillPasteboard {
   DCHECK(pasteboard_.get());
 
   [pasteboard_
       declareTypes:[NSArray arrayWithObject:ui::kChromeDragDummyPboardType]
              owner:contentsView_];
 
   // HTML.
-  if (!dropData_->text_html.empty())
+  if (!dropData_->html.string().empty())
     [pasteboard_ addTypes:[NSArray arrayWithObject:NSHTMLPboardType]
                     owner:contentsView_];
 
   // URL (and title).
   if (dropData_->url.is_valid())
     [pasteboard_ addTypes:[NSArray arrayWithObjects:NSURLPboardType,
                                                     kNSURLTitlePboardType, nil]
                     owner:contentsView_];
 
   std::string fileExtension;
@@ skipping 43 matching lines @@
                         owner:contentsView_];
       }
 
       // For the file promise, we need to specify the extension.
       [pasteboard_ setPropertyList:[NSArray arrayWithObject:fileExtension_]
                            forType:NSFilesPromisePboardType];
     }
   }
 
   // Plain text.
-  if (!dropData_->plain_text.empty())
+  if (!dropData_->text.string().empty())
     [pasteboard_ addTypes:[NSArray arrayWithObject:NSStringPboardType]
                     owner:contentsView_];
 
   if (!dropData_->custom_data.empty()) {
     [pasteboard_
         addTypes:[NSArray arrayWithObject:ui::kWebCustomDataPboardType]
            owner:contentsView_];
   }
 }
 
 - (NSImage*)dragImage {
   if (dragImage_)
     return dragImage_;
 
   // Default to returning a generic image.
   return gfx::GetCachedImageWithName(@"nav.pdf");
 }
 
 @end  // @implementation WebDragSource (Private)