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

Unified Diff: chrome/browser/ui/omnibox/omnibox_view_unittest.cc

Issue 558913003: Remove clipboard argument from ScopedClipboardWriter constructor. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Don't leak a clipboard on Windows Created 6 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
Index: chrome/browser/ui/omnibox/omnibox_view_unittest.cc
diff --git a/chrome/browser/ui/omnibox/omnibox_view_unittest.cc b/chrome/browser/ui/omnibox/omnibox_view_unittest.cc
index 5e756a90ced1c08700545f87f410e10f87a2b614..217f407e53237928457ce4dc5431d6633a5fb2cc 100644
--- a/chrome/browser/ui/omnibox/omnibox_view_unittest.cc
+++ b/chrome/browser/ui/omnibox/omnibox_view_unittest.cc
@@ -74,8 +74,7 @@ TEST_F(OmniboxViewTest, GetClipboardText) {
// Can we pull straight text off the clipboard?
{
- ui::ScopedClipboardWriter clipboard_writer(clipboard,
- ui::CLIPBOARD_TYPE_COPY_PASTE);
+ ui::ScopedClipboardWriter clipboard_writer(ui::CLIPBOARD_TYPE_COPY_PASTE);
clipboard_writer.WriteText(kPlainText);
}
EXPECT_EQ(kPlainText, OmniboxView::GetClipboardText());
@@ -84,8 +83,7 @@ TEST_F(OmniboxViewTest, GetClipboardText) {
const base::string16 kSpace6(ASCIIToUTF16(" "));
const base::string16 kSpace1(ASCIIToUTF16(" "));
{
- ui::ScopedClipboardWriter clipboard_writer(clipboard,
- ui::CLIPBOARD_TYPE_COPY_PASTE);
+ ui::ScopedClipboardWriter clipboard_writer(ui::CLIPBOARD_TYPE_COPY_PASTE);
clipboard_writer.WriteText(kSpace6);
}
EXPECT_EQ(kSpace1, OmniboxView::GetClipboardText());
@@ -100,16 +98,14 @@ TEST_F(OmniboxViewTest, GetClipboardText) {
const base::string16 kTitle(ASCIIToUTF16("The Example Company"));
// Can we pull a bookmark off the clipboard?
{
- ui::ScopedClipboardWriter clipboard_writer(clipboard,
- ui::CLIPBOARD_TYPE_COPY_PASTE);
+ ui::ScopedClipboardWriter clipboard_writer(ui::CLIPBOARD_TYPE_COPY_PASTE);
clipboard_writer.WriteBookmark(kTitle, kURL);
}
EXPECT_EQ(ASCIIToUTF16(kURL), OmniboxView::GetClipboardText());
// Do we pull text in preference to a bookmark?
{
- ui::ScopedClipboardWriter clipboard_writer(clipboard,
- ui::CLIPBOARD_TYPE_COPY_PASTE);
+ ui::ScopedClipboardWriter clipboard_writer(ui::CLIPBOARD_TYPE_COPY_PASTE);
clipboard_writer.WriteText(kPlainText);
clipboard_writer.WriteBookmark(kTitle, kURL);
}
@@ -119,8 +115,7 @@ TEST_F(OmniboxViewTest, GetClipboardText) {
// Do we get nothing if there is neither text nor a bookmark?
{
const base::string16 kMarkup(ASCIIToUTF16("<strong>Hi!</string>"));
- ui::ScopedClipboardWriter clipboard_writer(clipboard,
- ui::CLIPBOARD_TYPE_COPY_PASTE);
+ ui::ScopedClipboardWriter clipboard_writer(ui::CLIPBOARD_TYPE_COPY_PASTE);
clipboard_writer.WriteHTML(kMarkup, kURL);
}
EXPECT_TRUE(OmniboxView::GetClipboardText().empty());
« no previous file with comments | « chrome/browser/ui/omnibox/omnibox_view_browsertest.cc ('k') | chrome/browser/ui/views/omnibox/omnibox_view_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698