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

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: test cleanup Created 7 years, 5 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: 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..9f946fccaa0e5a63d9204f5150c0198536a0c2b0 100644
--- a/content/renderer/pepper/pepper_file_chooser_host_unittest.cc
+++ b/content/renderer/pepper/pepper_file_chooser_host_unittest.cc
@@ -15,6 +15,7 @@
#include "ppapi/host/host_message_context.h"
#include "ppapi/host/ppapi_host.h"
#include "ppapi/proxy/ppapi_messages.h"
+#include "ppapi/proxy/proxy_lock.h"
bbudge 2013/07/29 21:02:18 s/proxy/shared_impl
dmichael (off chromium) 2013/07/29 21:24:03 Oops, Done, thanks :)
#include "ppapi/proxy/resource_message_params.h"
#include "ppapi/proxy/resource_message_test_sink.h"
#include "ppapi/shared_impl/ppapi_permissions.h"
@@ -36,6 +37,7 @@ class PepperFileChooserHostTest : public RenderViewTest {
virtual void SetUp() {
SetContentClient(&client_);
RenderViewTest::SetUp();
+ ppapi::ProxyLock::DisableLockingOnThreadForTest();
globals_.GetResourceTracker()->DidCreateInstance(pp_instance_);
}

Powered by Google App Engine
This is Rietveld 408576698