Reverts a temporary fix for UIPasteboard on iOS 9 beta 5.

components/open_from_clipboard/clipboard_recent_content_ios_unittest.mm

 // Copyright 2015 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 "components/open_from_clipboard/clipboard_recent_content_ios.h"
 
 #import <UIKit/UIKit.h>
 
 #include "base/ios/ios_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 namespace {
+
+void SetPasteboardImage(UIImage* image) {
+  [[UIPasteboard generalPasteboard] setImage:image];
+}
+
 void SetPasteboardContent(const char* data) {
   [[UIPasteboard generalPasteboard]
                setValue:[NSString stringWithUTF8String:data]
       forPasteboardType:@"public.plain-text"];
 }
 const char kUnrecognizedURL[] = "ftp://foo/";
 const char kRecognizedURL[] = "http://bar/";
 const char kAppSpecificURL[] = "test://qux/";
 const char kAppSpecificScheme[] = "test";
 NSTimeInterval kSevenHours = 60 * 60 * 7;
@@ skipping 112 matching lines @@
   // Check that the even if the device is restarted, pasteboard content is
   // still suppressed.
   SimulateDeviceRestart();
   EXPECT_FALSE(clipboard_content_->GetRecentURLFromClipboard(&gurl));
 
   // Check that if the pasteboard changes, the new content is not
   // supressed anymore.
   SetPasteboardContent(kRecognizedURL);
   EXPECT_TRUE(clipboard_content_->GetRecentURLFromClipboard(&gurl));
 }
+
+// Checks that if user copies something other than a string we don't cache the
+// string in pasteboard.
+TEST_F(ClipboardRecentContentIOSTest, AddingNonStringRemovesCachedString) {
+  GURL gurl;
+  SetPasteboardContent(kRecognizedURL);
+
+  // Test that recent pasteboard data is provided.
+  EXPECT_TRUE(clipboard_content_->GetRecentURLFromClipboard(&gurl));
+  EXPECT_STREQ(kRecognizedURL, gurl.spec().c_str());
+
+  // Overwrite pasteboard with an image.
+  base::scoped_nsobject<UIImage> image([[UIImage alloc] init]);
+  SetPasteboardImage(image);
+
+  // Pasteboard should appear empty.
+  EXPECT_FALSE(clipboard_content_->GetRecentURLFromClipboard(&gurl));
+
+  // Tests that if URL is added again, pasteboard provides it normally.
+  SetPasteboardContent(kRecognizedURL);
+  EXPECT_TRUE(clipboard_content_->GetRecentURLFromClipboard(&gurl));
+  EXPECT_STREQ(kRecognizedURL, gurl.spec().c_str());
+}