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

Unified Diff: components/bookmarks/browser/bookmark_utils_unittest.cc

Issue 2229943002: Remove dependency on test_runner from some components unittests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: apply jam's fix for android from crrev.com/2233973003 Created 4 years, 4 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
Index: components/bookmarks/browser/bookmark_utils_unittest.cc
diff --git a/components/bookmarks/browser/bookmark_utils_unittest.cc b/components/bookmarks/browser/bookmark_utils_unittest.cc
index 54d89d780ba9fe9047a4706916d81da9ae26bb09..dfd6e435a5e90aa9d1df25244a3d068076f42213 100644
--- a/components/bookmarks/browser/bookmark_utils_unittest.cc
+++ b/components/bookmarks/browser/bookmark_utils_unittest.cc
@@ -20,15 +20,6 @@
#include "ui/base/clipboard/clipboard.h"
#include "ui/base/clipboard/scoped_clipboard_writer.h"
-#if defined(USE_GLIB) && defined(USE_X11)
-
-#include <memory>
-
-#include "ui/events/platform/x11/x11_event_source_glib.h" // nogncheck
-#include "ui/gfx/x/x11_types.h" // nogncheck
-
-#endif // defined(USE_GLIB) && defined(USE_X11)
-
using base::ASCIIToUTF16;
using std::string;
@@ -39,11 +30,7 @@ class BookmarkUtilsTest : public testing::Test,
public BaseBookmarkModelObserver {
public:
BookmarkUtilsTest()
- : grouped_changes_beginning_count_(0), grouped_changes_ended_count_(0) {
-#if defined(USE_GLIB) && defined(USE_X11)
- event_source_.reset(new ui::X11EventSourceGlib(gfx::GetXDisplay()));
-#endif // defined(USE_GLIB) && defined(USE_X11)
- }
+ : grouped_changes_beginning_count_(0), grouped_changes_ended_count_(0) {}
~BookmarkUtilsTest() override {}
@@ -86,11 +73,6 @@ class BookmarkUtilsTest : public testing::Test,
// Clipboard requires a message loop.
base::MessageLoopForUI loop_;
-#if defined(USE_GLIB) && defined(USE_X11)
- // On Linux, Clipboard also depends on an event source being present, to get
- // the timestamp.
- std::unique_ptr<ui::X11EventSourceGlib> event_source_;
-#endif // defined(USE_GLIB) && defined(USE_X11)
DISALLOW_COPY_AND_ASSIGN(BookmarkUtilsTest);
};
« no previous file with comments | « components/bookmarks/browser/bookmark_node_data_unittest.cc ('k') | components/error_page/renderer/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698