diff options
Diffstat (limited to 'ui/base/clipboard/clipboard_unittest.cc')
| -rw-r--r-- | ui/base/clipboard/clipboard_unittest.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/ui/base/clipboard/clipboard_unittest.cc b/ui/base/clipboard/clipboard_unittest.cc index 34483e8..ecf63f9 100644 --- a/ui/base/clipboard/clipboard_unittest.cc +++ b/ui/base/clipboard/clipboard_unittest.cc @@ -8,6 +8,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" +#include "base/pickle.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" @@ -22,10 +23,6 @@ #include "ui/base/clipboard/clipboard_util_win.h" #endif -#if defined(OS_WIN) || (defined(OS_POSIX) && !defined(OS_MACOSX)) -#include "base/pickle.h" -#endif - namespace ui { #if defined(OS_WIN) @@ -380,7 +377,6 @@ TEST_F(ClipboardTest, MultipleBitmapReadWriteTest) { } #endif -#if defined(OS_WIN) || (defined(OS_POSIX) && !defined(OS_MACOSX)) TEST_F(ClipboardTest, DataTest) { Clipboard clipboard; const char* kFormat = "chromium/x-test-format"; @@ -460,7 +456,6 @@ TEST_F(ClipboardTest, MultipleDataTest) { ASSERT_TRUE(read_pickle1.ReadString(&iter1, &unpickled_string1)); EXPECT_EQ(payload1, unpickled_string1); } -#endif #if defined(OS_WIN) // Windows only tests. TEST_F(ClipboardTest, HyperlinkTest) { |