Update WebClipboard/WebDropData glue to use new getter/setter for WebDragData.

webkit/tools/test_shell/mock_webclipboard_impl.h

 // Copyright (c) 2011 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.
 //
 // This file mocks out just enough of the WebClipboard API for running the
 // webkit tests. This is so we can run webkit tests without them sharing a
 // clipboard, which allows for running them in parallel and having the tests
 // not interact with actual user actions.
 
 #ifndef WEBKIT_TOOLS_TEST_SHELL_MOCK_WEBCLIPBOARD_IMPL_H_
 #define WEBKIT_TOOLS_TEST_SHELL_MOCK_WEBCLIPBOARD_IMPL_H_
 
+#include <map>
+
+#include "base/string16.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebClipboard.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebDragData.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebImage.h"
 
 class MockWebClipboardImpl : public WebKit::WebClipboard {
  public:
   MockWebClipboardImpl();
   ~MockWebClipboardImpl();
 
   virtual bool isFormatAvailable(WebKit::WebClipboard::Format format,
@@ skipping 15 matching lines @@
       const WebKit::WebString& htmlText, const WebKit::WebURL& url,
       const WebKit::WebString& plainText, bool writeSmartPaste);
   virtual void writeURL(
       const WebKit::WebURL& url, const WebKit::WebString& title);
   virtual void writeImage(
       const WebKit::WebImage& image, const WebKit::WebURL& url,
       const WebKit::WebString& title);
   virtual void writeDataObject(const WebKit::WebDragData& data);
 
  private:
+  void clear();
+
   WebKit::WebString m_plainText;
   WebKit::WebString m_htmlText;
   WebKit::WebImage m_image;
-  WebKit::WebVector<WebKit::WebDragData::CustomData> m_customData;
+  std::map<string16, string16> m_customData;
   bool m_writeSmartPaste;
 };
 
 #endif  // WEBKIT_TOOLS_TEST_SHELL_MOCK_WEBCLIPBOARD_IMPL_H_