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

Unified Diff: content/test/browser_test_base.cc

Issue 10806056: Move plugin_browsertests.cc from browser_tests to content_browsertests. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: sync to mac+win fixes Created 8 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/test/browser_test_base.cc
===================================================================
--- content/test/browser_test_base.cc (revision 147965)
+++ content/test/browser_test_base.cc (working copy)
@@ -6,6 +6,7 @@
#include "base/bind.h"
#include "base/command_line.h"
+#include "content/public/common/content_switches.h"
#include "content/public/common/main_function_params.h"
#include "sandbox/win/src/dep.h"
@@ -27,7 +28,12 @@
}
void BrowserTestBase::SetUp() {
- content::MainFunctionParams params(*CommandLine::ForCurrentProcess());
+ CommandLine* command_line = CommandLine::ForCurrentProcess();
+
+ // The tests assume that file:// URIs can freely access other file:// URIs.
+ command_line->AppendSwitch(switches::kAllowFileAccessFromFiles);
+
+ content::MainFunctionParams params(*command_line);
params.ui_task =
new base::Closure(
base::Bind(&BrowserTestBase::ProxyRunTestOnMainThreadLoop, this));

Powered by Google App Engine
This is Rietveld 408576698