Fix the WebStrings leak in MockWebClipboardImpl

content/test/mock_webclipboard_impl.cc

 // Copyright 2013 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/test/mock_webclipboard_impl.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
@@ skipping 15 matching lines @@
 
 namespace content {
 
 MockWebClipboardImpl::MockWebClipboardImpl() {}
 
 MockWebClipboardImpl::~MockWebClipboardImpl() {}
 
 bool MockWebClipboardImpl::isFormatAvailable(Format format, Buffer buffer) {
   switch (format) {
     case FormatPlainText:
-      return !m_plainText.isNull();
+      return !m_plainText.is_null();
 
     case FormatHTML:
-      return !m_htmlText.isNull();
+      return !m_htmlText.is_null();
 
     case FormatSmartPaste:
       return m_writeSmartPaste;
 
     default:
       NOTREACHED();
       return false;
   }
 
   switch (buffer) {
     case BufferStandard:
       break;
     case BufferSelection:
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
       break;
 #endif
     default:
       NOTREACHED();
       return false;
   }
 
   return true;
 }
 
 WebVector<WebString> MockWebClipboardImpl::readAvailableTypes(
     Buffer buffer,
     bool* containsFilenames) {
   *containsFilenames = false;
   std::vector<WebString> results;
-  if (!m_plainText.isEmpty()) {
+  if (!m_plainText.string().empty()) {
     results.push_back(WebString("text/plain"));
   }
-  if (!m_htmlText.isEmpty()) {
+  if (!m_htmlText.string().empty()) {
     results.push_back(WebString("text/html"));
   }
   if (!m_image.isNull()) {
     results.push_back(WebString("image/png"));
   }
   for (std::map<base::string16, base::string16>::const_iterator it =
            m_customData.begin();
        it != m_customData.end(); ++it) {
     CHECK(std::find(results.begin(), results.end(), it->first) ==
           results.end());
     results.push_back(it->first);
   }
   return results;
 }
 
 blink::WebString MockWebClipboardImpl::readPlainText(
     blink::WebClipboard::Buffer buffer) {
   return m_plainText;
 }
 
 // TODO(wtc): set output argument *url.
 blink::WebString MockWebClipboardImpl::readHTML(
     blink::WebClipboard::Buffer buffer,
     blink::WebURL* url,
     unsigned* fragmentStart,
     unsigned* fragmentEnd) {
   *fragmentStart = 0;
-  *fragmentEnd = static_cast<unsigned>(m_htmlText.length());
+  *fragmentEnd = static_cast<unsigned>(m_htmlText.string().length());
   return m_htmlText;
 }
 
 blink::WebData MockWebClipboardImpl::readImage(
     blink::WebClipboard::Buffer buffer) {
   std::string data;
   std::vector<unsigned char> encoded_image;
   // TODO(dcheng): Verify that we can assume the image is ARGB8888. Note that
   // for endianess reasons, it will be BGRA8888 on Windows.
   const SkBitmap& bitmap = m_image.getSkBitmap();
@@ skipping 81 matching lines @@
         continue;
       }
       case WebDragData::Item::StorageTypeFilename:
       case WebDragData::Item::StorageTypeBinaryData:
         NOTREACHED();  // Currently unused by the clipboard implementation.
     }
   }
 }
 
 void MockWebClipboardImpl::clear() {
-  m_plainText = WebString();
-  m_htmlText = WebString();
+  m_plainText = base::NullableString16();
+  m_htmlText = base::NullableString16();
   m_image.reset();
   m_customData.clear();
   m_writeSmartPaste = false;
 }
 
 }  // namespace content