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

Unified Diff: content/test/webrtc_audio_device_test.cc

Issue 10449094: Fix client-side phishing detection test flakiness and ChromeOS failure. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Restore the previous sandbox-enabled state Created 8 years, 6 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 | « content/test/webrtc_audio_device_test.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/test/webrtc_audio_device_test.cc
diff --git a/content/test/webrtc_audio_device_test.cc b/content/test/webrtc_audio_device_test.cc
index 6826daad59f3790d41e67133389833a5535dfb51..73d9260e2f03d05d963a9e13d7be355afb82432e 100644
--- a/content/test/webrtc_audio_device_test.cc
+++ b/content/test/webrtc_audio_device_test.cc
@@ -20,11 +20,12 @@
#include "content/public/browser/browser_thread.h"
#include "content/public/common/content_paths.h"
#include "content/public/test/mock_resource_context.h"
+#include "content/public/test/test_browser_thread.h"
#include "content/renderer/media/audio_hardware.h"
#include "content/renderer/media/webrtc_audio_device_impl.h"
#include "content/renderer/render_process.h"
#include "content/renderer/render_thread_impl.h"
-#include "content/public/test/test_browser_thread.h"
+#include "content/renderer/renderer_webkitplatformsupport_impl.h"
#include "net/url_request/url_request_test_util.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -137,6 +138,8 @@ void WebRTCAudioDeviceTest::SetUp() {
base::Unretained(this), kThreadName));
WaitForIOThreadCompletion();
+ sandbox_was_enabled_ =
+ RendererWebKitPlatformSupportImpl::SetSandboxEnabledForTesting(false);
render_thread_ = new RenderThreadImpl(kThreadName);
}
@@ -166,6 +169,8 @@ void WebRTCAudioDeviceTest::TearDown() {
base::Unretained((this))));
WaitForIOThreadCompletion();
mock_process_.reset();
+ RendererWebKitPlatformSupportImpl::SetSandboxEnabledForTesting(
+ sandbox_was_enabled_);
}
bool WebRTCAudioDeviceTest::Send(IPC::Message* message) {
« no previous file with comments | « content/test/webrtc_audio_device_test.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698