chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc - Issue 307453010: Fix a crash when chooseDesktopMedia is called with no target tab

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/extensions/api/desktop_capture/desktop_capture_apitest.cc

Issue 307453010: Fix a crash when chooseDesktopMedia is called with no target tab (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 7 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

« chrome/browser/extensions/api/desktop_capture/desktop_capture_api.cc ('K') | « chrome/browser/extensions/api/desktop_capture/desktop_capture_api.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc

diff --git a/chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc b/chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc

index e2b9649791b456837c4dde41f279b46f3b564362..dbcc7c4d7f1892d886729a12d96e7712b1c03f5e 100644

--- a/chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc

+++ b/chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc

@@ -54,7 +54,8 @@ class FakeDesktopMediaPicker : public DesktopMediaPicker {

const base::string16& target_name,

scoped_ptr<DesktopMediaList> model,

const DoneCallback& done_callback) OVERRIDE {

- if (!expectation_->cancelled) {

+ EXPECT_TRUE(web_contents);

+ if (!expectation_->cancelled || !web_contents) {

// Post a task to call the callback asynchronously.

base::ThreadTaskRunnerHandle::Get()->PostTask(

FROM_HERE,