content/renderer/pepper/pepper_file_chooser_host_unittest.cc - Issue 19492014: PPAPI: Purposely leak ProxyLock, fix shutdown race

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: content/renderer/pepper/pepper_file_chooser_host_unittest.cc

Issue 19492014: PPAPI: Purposely leak ProxyLock, fix shutdown race (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Remove static initializer Created 7 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:

Index: content/renderer/pepper/pepper_file_chooser_host_unittest.cc

diff --git a/content/renderer/pepper/pepper_file_chooser_host_unittest.cc b/content/renderer/pepper/pepper_file_chooser_host_unittest.cc

index b228cd72f5b1decc2719efb24abbddfcca3631e2..caa70752eed54b4365576cc4796fe82e7aa78464 100644

--- a/content/renderer/pepper/pepper_file_chooser_host_unittest.cc

+++ b/content/renderer/pepper/pepper_file_chooser_host_unittest.cc

@@ -19,6 +19,7 @@

#include "ppapi/proxy/resource_message_test_sink.h"

#include "ppapi/shared_impl/ppapi_permissions.h"

#include "ppapi/shared_impl/ppb_file_ref_shared.h"

+#include "ppapi/shared_impl/proxy_lock.h"

#include "ppapi/shared_impl/resource_tracker.h"

#include "ppapi/shared_impl/test_globals.h"

#include "testing/gtest/include/gtest/gtest.h"

@@ -36,6 +37,7 @@ class PepperFileChooserHostTest : public RenderViewTest {

virtual void SetUp() {

SetContentClient(&client_);

RenderViewTest::SetUp();

+ ppapi::ProxyLock::DisableLockingOnThreadForTest();

globals_.GetResourceTracker()->DidCreateInstance(pp_instance_);

}