More TOUCH_UI hacks and constant removal. And TODO(saintlou) cleanup.

chrome/browser/bookmarks/bookmark_utils_unittest.cc

 // 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.
 
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 104 matching lines @@
                                       string()));
   EXPECT_TRUE(DoesBookmarkContainText(
       node, WideToUTF16(L"Fr\u00C4n\u00C7\u00F3S\u00EA"), string()));
   EXPECT_TRUE(DoesBookmarkContainText(
       node, WideToUTF16(L"fr\u00C4n\u00C7\u00D3s\u00CA"), string()));
   EXPECT_TRUE(DoesBookmarkContainText(node, ASCIIToUTF16("fba"), string()));
   EXPECT_TRUE(DoesBookmarkContainText(node, ASCIIToUTF16("FBA"), string()));
 }
 
 #if !defined(OS_MACOSX)
-#if defined(TOUCH_UI)
-// TODO(wyck): Functionality disabled on TOUCH_UI to work around clipboard hang
-// in http://crbug.com/96448
-#define MAYBE_CopyPaste FAILS_CopyPaste
-#else
-#define MAYBE_CopyPaste CopyPaste
-#endif
-TEST(BookmarkUtilsTest, MAYBE_CopyPaste) {
+TEST(BookmarkUtilsTest, CopyPaste) {
   // Clipboard requires a message loop.
   MessageLoopForUI loop;
 
   BookmarkModel model(NULL);
   const BookmarkNode* node = model.AddURL(model.other_node(),
                                           0,
                                           ASCIIToUTF16("foo bar"),
                                           GURL("http://www.google.com"));
 
   // Copy a node to the clipboard.
@@ skipping 10 matching lines @@
     clipboard_writer.WriteText(ASCIIToUTF16("foo"));
   }
 
   // Now we shouldn't be able to paste from the clipboard.
   EXPECT_FALSE(CanPasteFromClipboard(model.bookmark_bar_node()));
 }
 #endif
 
 }  // namespace
 }  // namespace bookmark_utils