Fix the HTML5 drag and drop demos on Linux and CrOS

ui/base/dragdrop/os_exchange_data_unittest.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 "base/message_loop/message_loop.h"
 #include "base/pickle.h"
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
@@ skipping 52 matching lines @@
       OSExchangeData::DO_NOT_CONVERT_FILENAMES, &output_url, &output_title));
   EXPECT_EQ(url_spec, output_url.spec());
   EXPECT_EQ(url_title, output_title);
   base::string16 output_string;
 
   // URL should be the raw text response
   EXPECT_TRUE(data2.GetString(&output_string));
   EXPECT_EQ(url_spec, base::UTF16ToUTF8(output_string));
 }
 
+// Test that setting the URL does not overwrite a previously set custom string.
+TEST_F(OSExchangeDataTest, URLAndString) {
+  OSExchangeData data;
+  base::string16 string = base::ASCIIToUTF16("I can has cheezburger?");
+  data.SetString(string);
+  std::string url_spec = "http://www.google.com/";
+  GURL url(url_spec);
+  base::string16 url_title = base::ASCIIToUTF16("www.google.com");
+  data.SetURL(url, url_title);
+
+  base::string16 output_string;
+  EXPECT_TRUE(data.GetString(&output_string));
+  EXPECT_EQ(string, output_string);
+
+  GURL output_url;
+  base::string16 output_title;
+  EXPECT_TRUE(data.GetURLAndTitle(
+      OSExchangeData::CONVERT_FILENAMES, &output_url, &output_title));
+  EXPECT_EQ(url_spec, output_url.spec());
+  EXPECT_EQ(url_title, output_title);
+}
+
 TEST_F(OSExchangeDataTest, TestPickledData) {
   const OSExchangeData::CustomFormat kTestFormat =
       ui::Clipboard::GetFormatType("application/vnd.chromium.test");
 
   Pickle saved_pickle;
   saved_pickle.WriteInt(1);
   saved_pickle.WriteInt(2);
   OSExchangeData data;
   data.SetPickledData(kTestFormat, saved_pickle);
 
@@ skipping 21 matching lines @@
   data.SetHtml(html, url);
 
   OSExchangeData copy(data.provider().Clone());
   base::string16 read_html;
   EXPECT_TRUE(copy.GetHtml(&read_html, &url));
   EXPECT_EQ(html, read_html);
 }
 #endif
 
 }  // namespace ui