Index: webkit/glue/scoped_clipboard_writer_glue.cc |
diff --git a/webkit/glue/scoped_clipboard_writer_glue.cc b/webkit/glue/scoped_clipboard_writer_glue.cc |
index e5ac21189fe2706663a400dce46118e9fcb8dc85..f648b7bf1c1b8ebd3d3e80170a89fc22b2337492 100644 |
--- a/webkit/glue/scoped_clipboard_writer_glue.cc |
+++ b/webkit/glue/scoped_clipboard_writer_glue.cc |
@@ -11,19 +11,19 @@ ScopedClipboardWriterGlue::ScopedClipboardWriterGlue( |
ui::Clipboard::BUFFER_STANDARD), |
context_(client->CreateWriteContext()) { |
// We should never have an instance where both are set. |
- DCHECK((clipboard_ && !context_) || |
- (!clipboard_ && context_)); |
+ DCHECK((clipboard_ && !context_.get()) || |
+ (!clipboard_ && context_.get())); |
} |
ScopedClipboardWriterGlue::~ScopedClipboardWriterGlue() { |
- if (!objects_.empty() && context_) { |
- context_->FlushAndDestroy(objects_); |
+ if (!objects_.empty() && context_.get()) { |
+ context_->Flush(objects_); |
} |
} |
void ScopedClipboardWriterGlue::WriteBitmapFromPixels(const void* pixels, |
const gfx::Size& size) { |
- if (context_) { |
+ if (context_.get()) { |
context_->WriteBitmapFromPixels(&objects_, pixels, size); |
} else { |
ScopedClipboardWriter::WriteBitmapFromPixels(pixels, size); |