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

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

Issue 10917196: Fix memory leak in BookmarkUtilsTest.CopyPaste. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Now with three other cases. Created 8 years, 3 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 | « no previous file | chrome/browser/ui/omnibox/omnibox_view_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/bookmarks/bookmark_utils_unittest.cc
diff --git a/chrome/browser/bookmarks/bookmark_utils_unittest.cc b/chrome/browser/bookmarks/bookmark_utils_unittest.cc
index 9b4100b82ebdbbb776147439bc89214087bf2902..7ddf6838be17bc7794458a7443b62c31f13386c1 100644
--- a/chrome/browser/bookmarks/bookmark_utils_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_utils_unittest.cc
@@ -8,6 +8,7 @@
#include "base/utf_string_conversions.h"
#include "chrome/browser/bookmarks/bookmark_model.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "ui/base/clipboard/clipboard.h"
#include "ui/base/clipboard/scoped_clipboard_writer.h"
using std::string;
@@ -15,7 +16,14 @@ using std::string;
namespace bookmark_utils {
namespace {
-TEST(BookmarkUtilsTest, GetBookmarksContainingText) {
+class BookmarkUtilsTest : public ::testing::Test {
+ public:
+ virtual void TearDown() OVERRIDE {
+ ui::Clipboard::DestroyClipboardForCurrentThread();
+ }
+};
+
+TEST_F(BookmarkUtilsTest, GetBookmarksContainingText) {
BookmarkModel model(NULL);
const BookmarkNode* n1 = model.AddURL(model.other_node(),
0,
@@ -51,7 +59,7 @@ TEST(BookmarkUtilsTest, GetBookmarksContainingText) {
nodes.clear();
}
-TEST(BookmarkUtilsTest, DoesBookmarkContainText) {
+TEST_F(BookmarkUtilsTest, DoesBookmarkContainText) {
BookmarkModel model(NULL);
const BookmarkNode* node = model.AddURL(model.other_node(),
0,
@@ -118,7 +126,7 @@ TEST(BookmarkUtilsTest, DoesBookmarkContainText) {
}
#if !defined(OS_MACOSX)
-TEST(BookmarkUtilsTest, CopyPaste) {
+TEST_F(BookmarkUtilsTest, CopyPaste) {
// Clipboard requires a message loop.
MessageLoopForUI loop;
« no previous file with comments | « no previous file | chrome/browser/ui/omnibox/omnibox_view_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698