Merge 32271 - Don't allow content scripts to execute on file:// urls....

chrome/test/page_cycler/page_cycler_test.cc

Index: chrome/test/page_cycler/page_cycler_test.cc
===================================================================
--- chrome/test/page_cycler/page_cycler_test.cc	(revision 32775)
+++ chrome/test/page_cycler/page_cycler_test.cc	(working copy)
@@ -162,6 +162,9 @@
     // Expose garbage collection for the page cycler tests.
     launch_arguments_.AppendSwitchWithValue(switches::kJavaScriptFlags,
                                             L"--expose_gc");
+    // Page cycler tests need to run content scripts on file:// urls.
+    launch_arguments_.AppendSwitch(switches::kEnableJsOnFileUrls);
+
 #if defined(OS_MACOSX)
     static rlim_t initial_fd_limit = GetFileDescriptorLimit();
     fd_limit_ = initial_fd_limit;