chrome/browser/ui/pdf/pdf_browsertest.cc - Issue 10916214: Try 2 - Change how ui::Clipboard is accessed so there's only one per thread.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/pdf/pdf_browsertest.cc

Issue 10916214: Try 2 - Change how ui::Clipboard is accessed so there's only one per thread. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Moved to BrowserThreadsStarted 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 | « chrome/browser/ui/omnibox/omnibox_view_unittest.cc ('k') | chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/pdf/pdf_browsertest.cc

diff --git a/chrome/browser/ui/pdf/pdf_browsertest.cc b/chrome/browser/ui/pdf/pdf_browsertest.cc

index 64a4464bf074b930cfdb659b25ed575d91a1574d..8cb44b3ff3be5aa4f15a59ea064add399ef02561 100644

--- a/chrome/browser/ui/pdf/pdf_browsertest.cc

+++ b/chrome/browser/ui/pdf/pdf_browsertest.cc

@@ -269,20 +269,19 @@ IN_PROC_BROWSER_TEST_F(PDFBrowserTest, MAYBE_FindAndCopy) {

true, false, NULL, NULL));

// Verify that copying selected text works.

- ui::Clipboard clipboard;

+ ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();

// Reset the clipboard first.

ui::Clipboard::ObjectMap objects;

ui::Clipboard::ObjectMapParams params;

params.push_back(std::vector<char>());

objects[ui::Clipboard::CBF_TEXT] = params;

- clipboard.WriteObjects(ui::Clipboard::BUFFER_STANDARD, objects);

+ clipboard->WriteObjects(ui::Clipboard::BUFFER_STANDARD, objects);

chrome::GetActiveWebContents(browser())->GetRenderViewHost()->Copy();

ASSERT_NO_FATAL_FAILURE(WaitForResponse());

std::string text;

- clipboard.ReadAsciiText(ui::Clipboard::BUFFER_STANDARD, &text);

+ clipboard->ReadAsciiText(ui::Clipboard::BUFFER_STANDARD, &text);

ASSERT_EQ("adipiscing", text);

}