Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1908)

Unified Diff: content/common/cursors/webcursor_unittest.cc

Issue 234533002: Remove a bunch of TOOLKIT_GTK in content/ and gpu/, as well as NPAPI plugins on linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, skip changing browser_main_loop.cc because of presubmit issues, will follow up Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/child/npapi/webplugin_delegate_impl.h ('k') | content/common/gpu/client/gl_helper_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/cursors/webcursor_unittest.cc
diff --git a/content/common/cursors/webcursor_unittest.cc b/content/common/cursors/webcursor_unittest.cc
index a57b84338e6671eb8ffa57160ec43d2f9a900679..31c6ea114ef7b279c8c0060261d96440a7e4b3ee 100644
--- a/content/common/cursors/webcursor_unittest.cc
+++ b/content/common/cursors/webcursor_unittest.cc
@@ -31,13 +31,6 @@ TEST(WebCursorTest, OKCursorSerialization) {
ok_custom_pickle.WriteUInt32(0);
PickleIterator iter(ok_custom_pickle);
EXPECT_TRUE(custom_cursor.Deserialize(&iter));
-
-#if defined(TOOLKIT_GTK)
- // On GTK+ using platforms, we should get a real native GdkCursor object back
- // (and the memory used should automatically be freed by the WebCursor object
- // for valgrind tests).
- EXPECT_TRUE(custom_cursor.GetCustomCursor());
-#endif
}
TEST(WebCursorTest, BrokenCursorSerialization) {
@@ -193,13 +186,6 @@ TEST(WebCursorTest, EmptyImage) {
// cursor.
PickleIterator iter(broken_cursor_pickle);
ASSERT_TRUE(custom_cursor.Deserialize(&iter));
-
-#if defined(TOOLKIT_GTK)
- // On GTK+ using platforms, we make sure that we get NULL back from this
- // method; the relevant GDK methods take NULL as a request to use the default
- // cursor.
- EXPECT_EQ(NULL, custom_cursor.GetCustomCursor());
-#endif
}
TEST(WebCursorTest, Scale2) {
@@ -222,13 +208,6 @@ TEST(WebCursorTest, Scale2) {
ok_custom_pickle.WriteUInt32(0);
PickleIterator iter(ok_custom_pickle);
EXPECT_TRUE(custom_cursor.Deserialize(&iter));
-
-#if defined(TOOLKIT_GTK)
- // On GTK+ using platforms, we should get a real native GdkCursor object back
- // (and the memory used should automatically be freed by the WebCursor object
- // for valgrind tests).
- EXPECT_TRUE(custom_cursor.GetCustomCursor());
-#endif
}
} // namespace content
« no previous file with comments | « content/child/npapi/webplugin_delegate_impl.h ('k') | content/common/gpu/client/gl_helper_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698