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

Unified Diff: content/test/render_view_fake_resources_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/renderer/renderer_webkitplatformsupport_impl.cc ('k') | content/test/webrtc_audio_device_test.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/test/render_view_fake_resources_test.cc
diff --git a/content/test/render_view_fake_resources_test.cc b/content/test/render_view_fake_resources_test.cc
index 4ba5108bc1992f4b35c637b46d49928760d6bf10..d26ebd8c1c9cadf72ccfc1f794135c5f5d800891 100644
--- a/content/test/render_view_fake_resources_test.cc
+++ b/content/test/render_view_fake_resources_test.cc
@@ -14,6 +14,7 @@
#include "content/public/common/resource_response.h"
#include "content/renderer/render_thread_impl.h"
#include "content/renderer/render_view_impl.h"
+#include "content/renderer/renderer_webkitplatformsupport_impl.h"
#include "content/test/mock_render_process.h"
#include "googleurl/src/gurl.h"
#include "net/base/upload_data.h"
@@ -68,6 +69,8 @@ void RenderViewFakeResourcesTest::SetUp() {
webkit_glue::SetJavaScriptFlags("--expose-gc");
mock_process_.reset(new MockRenderProcess);
+ sandbox_was_enabled_ =
+ RendererWebKitPlatformSupportImpl::SetSandboxEnabledForTesting(false);
render_thread_ = new RenderThreadImpl(channel_id);
// Tell the renderer to create a view, then wait until it's ready.
@@ -97,6 +100,8 @@ void RenderViewFakeResourcesTest::TearDown() {
} while (view_);
mock_process_.reset();
+ RendererWebKitPlatformSupportImpl::SetSandboxEnabledForTesting(
+ sandbox_was_enabled_);
}
RenderView* RenderViewFakeResourcesTest::view() {
« no previous file with comments | « content/renderer/renderer_webkitplatformsupport_impl.cc ('k') | content/test/webrtc_audio_device_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698